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

Piotr Caban : oleview: Added data freeing in TypeLib Viewer.
by Alexandre Julliard 19 Jul '06

19 Jul '06

Module: wine Branch: refs/heads/master Commit: 0260b269623820630529fb32e53b4f29cc2ac111 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0260b269623820630529fb3… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 18 12:55:31 2006 +0200 oleview: Added data freeing in TypeLib Viewer. --- programs/oleview/typelib.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index ff5fb1c..c516a6a 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -560,6 +560,36 @@ void UpdateTypeLibStatusBar(int itemID) SendMessage(typelib.hStatusBar, SB_SETTEXT, 0, (LPARAM)info); } +void EmptyTLTree(void) +{ + HTREEITEM cur, del; + TVITEM tvi; + + tvi.mask = TVIF_PARAM; + cur = TreeView_GetChild(typelib.hTree, TVI_ROOT); + + while(TRUE) + { + del = cur; + cur = TreeView_GetChild(typelib.hTree, del); + + if(!cur) cur = TreeView_GetNextSibling(typelib.hTree, del); + if(!cur) cur = TreeView_GetParent(typelib.hTree, del); + + tvi.hItem = del; + SendMessage(typelib.hTree, TVM_GETITEM, 0, (LPARAM)&tvi); + if(tvi.lParam) + { + HeapFree(GetProcessHeap(), 0, ((TYPELIB_DATA *)tvi.lParam)->idl); + HeapFree(GetProcessHeap(), 0, (TYPELIB_DATA *)tvi.lParam); + } + + SendMessage(typelib.hTree, TVM_DELETEITEM, 0, (LPARAM)del); + + if(!cur) break; + } +} + LRESULT CALLBACK TypeLibProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch(uMsg) @@ -596,6 +626,7 @@ LRESULT CALLBACK TypeLibProc(HWND hWnd, TypeLibResizeChild(); break; case WM_DESTROY: + EmptyTLTree(); break; default: return DefWindowProc(hWnd, uMsg, wParam, lParam);

1 0

Piotr Caban : oleview: Added some features to IDL data displaying.
by Alexandre Julliard 19 Jul '06

19 Jul '06

Module: wine Branch: refs/heads/master Commit: 928966ddad1949bda59af30ad2f9bf12164ceb89 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=928966ddad1949bda59af30… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 18 12:54:30 2006 +0200 oleview: Added some features to IDL data displaying. --- programs/oleview/main.h | 1 programs/oleview/typelib.c | 92 ++++++++++++++++++++++++++++++++++++++------ 2 files changed, 81 insertions(+), 12 deletions(-) diff --git a/programs/oleview/main.h b/programs/oleview/main.h index 33195de..d9f4a75 100644 --- a/programs/oleview/main.h +++ b/programs/oleview/main.h @@ -115,6 +115,7 @@ typedef struct typedef struct { WCHAR *idl; + WCHAR wszInsertAfter[MAX_LOAD_STRING]; INT idlLen; }TYPELIB_DATA; diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 1ccbca0..ff5fb1c 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -37,6 +37,8 @@ static const WCHAR wszOpenBrackets1[] = static const WCHAR wszCloseBrackets1[] = { ']','\0' }; static const WCHAR wszOpenBrackets2[] = { '(','\0' }; static const WCHAR wszCloseBrackets2[] = { ')','\0' }; +static const WCHAR wszOpenBrackets3[] = { '{','\0' }; +static const WCHAR wszCloseBrackets3[] = { '}','\0' }; static const WCHAR wszUUID[] = { 'u','u','i','d','\0' }; @@ -93,6 +95,25 @@ LPARAM InitializeTLData(void) return (LPARAM)pTLData; } +void AddChildrenData(HTREEITEM hParent, TYPELIB_DATA *pData) +{ + HTREEITEM hCur; + TVITEM tvi; + + memset(&tvi, 0, sizeof(&tvi)); + + hCur = TreeView_GetChild(typelib.hTree, hParent); + do + { + tvi.hItem = hCur; + SendMessage(typelib.hTree, TVM_GETITEM, 0, (LPARAM)&tvi); + if(tvi.lParam && ((TYPELIB_DATA *)(tvi.lParam))->idlLen) + AddToTLDataStrW(pData, ((TYPELIB_DATA *)(tvi.lParam))->idl); + }while((hCur = TreeView_GetNextSibling(typelib.hTree, hCur))); + + AddToTLDataStrW(pData, pData->wszInsertAfter); +} + void CreateTypeInfo(WCHAR *wszAddTo, WCHAR *wszAddAfter, TYPEDESC tdesc, ITypeInfo *pTypeInfo) { int i; @@ -166,7 +187,7 @@ int EnumVars(ITypeInfo *pTypeInfo, int c WCHAR wszText[MAX_LOAD_STRING]; WCHAR wszAfter[MAX_LOAD_STRING]; - U(tvis).item.mask = TVIF_TEXT; + U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM; U(tvis).item.cchTextMax = MAX_LOAD_STRING; U(tvis).item.pszText = wszText; tvis.hInsertAfter = (HTREEITEM)TVI_LAST; @@ -184,6 +205,10 @@ int EnumVars(ITypeInfo *pTypeInfo, int c AddToStrW(wszText, wszSpace); AddToStrW(wszText, bstrName); AddToStrW(wszText, wszAfter); + U(tvis).item.lParam = InitializeTLData(); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszText); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszSemicolon); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszNewLine); SendMessage(typelib.hTree, TVM_INSERTITEM, 0, (LPARAM)&tvis); SysFreeString(bstrName); @@ -309,6 +334,7 @@ int PopulateTree(void) const WCHAR wszHelpString[] = { 'h','e','l','p','s','t','r','i','n','g','\0' }; const WCHAR wszLibrary[] = { 'l','i','b','r','a','r','y',' ','\0' }; + const WCHAR wszTag[] = { 't','a','g','\0' }; U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM; U(tvis).item.cchTextMax = MAX_LOAD_STRING; @@ -361,6 +387,10 @@ int PopulateTree(void) AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszLibrary); AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), bstrName); AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszNewLine); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszOpenBrackets3); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszNewLine); + AddToStrW(((TYPELIB_DATA*)(U(tvis).item.lParam))->wszInsertAfter, wszCloseBrackets3); + AddToStrW(((TYPELIB_DATA*)(U(tvis).item.lParam))->wszInsertAfter, wszSemicolon); wsprintfW(wszText, wszFormat, bstrName, bstrData); SysFreeString(bstrName); @@ -377,18 +407,49 @@ int PopulateTree(void) memset(wszText, 0, sizeof(wszText)); memset(wszAfter, 0, sizeof(wszAfter)); + U(tvis).item.lParam = InitializeTLData(); switch(pTypeAttr->typekind) { -#define TKINDADDTOSTR(x) case x:\ - AddToStrW(wszText, wsz##x);\ - AddToStrW(wszText, bstrName);\ - break - TKINDADDTOSTR(TKIND_ENUM); - TKINDADDTOSTR(TKIND_RECORD); - TKINDADDTOSTR(TKIND_MODULE); - TKINDADDTOSTR(TKIND_INTERFACE); - TKINDADDTOSTR(TKIND_COCLASS); - TKINDADDTOSTR(TKIND_UNION); + case TKIND_ENUM: + AddToStrW(wszText, wszTKIND_ENUM); + AddToStrW(wszText, bstrName); + break; + case TKIND_RECORD: + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszTKIND_RECORD); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszTag); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), bstrName); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszSpace); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszOpenBrackets3); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszNewLine); + AddToStrW(((TYPELIB_DATA*)(U(tvis).item.lParam))->wszInsertAfter, + wszCloseBrackets3); + AddToStrW(((TYPELIB_DATA*)(U(tvis).item.lParam))->wszInsertAfter, + wszSpace); + AddToStrW(((TYPELIB_DATA*)(U(tvis).item.lParam))->wszInsertAfter, + bstrName); + AddToStrW(((TYPELIB_DATA*)(U(tvis).item.lParam))->wszInsertAfter, + wszSemicolon); + AddToStrW(((TYPELIB_DATA*)(U(tvis).item.lParam))->wszInsertAfter, + wszNewLine); + AddToStrW(wszText, wszTKIND_RECORD); + AddToStrW(wszText, bstrName); + break; + case TKIND_MODULE: + AddToStrW(wszText, wszTKIND_MODULE); + AddToStrW(wszText, bstrName); + break; + case TKIND_INTERFACE: + AddToStrW(wszText, wszTKIND_INTERFACE); + AddToStrW(wszText, bstrName); + break; + case TKIND_COCLASS: + AddToStrW(wszText, wszTKIND_COCLASS); + AddToStrW(wszText, bstrName); + break; + case TKIND_UNION: + AddToStrW(wszText, wszTKIND_UNION); + AddToStrW(wszText, bstrName); + break; case TKIND_DISPATCH: AddToStrW(wszText, wszTKIND_DISPATCH); AddToStrW(wszText, bstrName); @@ -397,6 +458,7 @@ #define TKINDADDTOSTR(x) case x:\ hParent = TreeView_InsertItem(typelib.hTree, &tvis); EnumImplTypes(pTypeInfo, pTypeAttr->cImplTypes, hParent); memset(wszText, 0, sizeof(wszText)); + U(tvis).item.lParam = InitializeTLData(); ITypeInfo_GetRefTypeInfo(pTypeInfo, hRefType, &pRefTypeInfo); ITypeInfo_GetDocumentation(pRefTypeInfo, MEMBERID_NIL, &bstrName, @@ -424,6 +486,8 @@ #define TKINDADDTOSTR(x) case x:\ EnumFuncs(pTypeInfo, pTypeAttr->cFuncs, hParent); EnumImplTypes(pTypeInfo, pTypeAttr->cImplTypes, hParent); + AddChildrenData(hParent, (TYPELIB_DATA*)(U(tvis).item.lParam)); + ITypeInfo_ReleaseTypeAttr(pTypeInfo, pTypeAttr); ITypeInfo_Release(pTypeInfo); SysFreeString(bstrName); @@ -443,7 +507,11 @@ void UpdateData(HTREEITEM item) tvi.hItem = item; SendMessage(typelib.hTree, TVM_GETITEM, 0, (LPARAM)&tvi); - if(!tvi.lParam || !((TYPELIB_DATA*)tvi.lParam)->idlLen) return; + if(!tvi.lParam) + { + SetWindowText(typelib.hEdit, wszSpace); + return; + } SetWindowText(typelib.hEdit, ((TYPELIB_DATA*)tvi.lParam)->idl); }

1 0

Piotr Caban : oleview: Added skeleton for IDL files generation.
by Alexandre Julliard 19 Jul '06

19 Jul '06

Module: wine Branch: refs/heads/master Commit: 83edbac0b2849f8ac391fa569b6ff7560892a865 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=83edbac0b2849f8ac391fa5… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 18 12:53:19 2006 +0200 oleview: Added skeleton for IDL files generation. --- programs/oleview/main.h | 8 ++++ programs/oleview/pane.c | 9 ++++ programs/oleview/typelib.c | 95 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 110 insertions(+), 2 deletions(-) diff --git a/programs/oleview/main.h b/programs/oleview/main.h index 689e01f..33195de 100644 --- a/programs/oleview/main.h +++ b/programs/oleview/main.h @@ -39,6 +39,7 @@ #define MAX_WINDOW_WIDTH 30000 #define STATUS_WINDOW 2000 #define TREE_WINDOW 2001 #define TAB_WINDOW 2002 +#define TYPELIB_TREE 2003 /*ItemInfo flags */ #define REGTOP 1 @@ -111,6 +112,12 @@ typedef struct WCHAR wszFileName[MAX_LOAD_STRING]; }TYPELIB; +typedef struct +{ + WCHAR *idl; + INT idlLen; +}TYPELIB_DATA; + extern GLOBALS globals; extern TREE tree; extern TYPELIB typelib; @@ -141,6 +148,7 @@ void ReleaseInst(HTREEITEM item); /* typelib.c */ BOOL CreateTypeLibWindow(HINSTANCE hInst, WCHAR *wszFileName); BOOL TypeLibRegisterClass(void); +void UpdateData(HTREEITEM item); /* interface.c */ BOOL IsInterface(HTREEITEM item); diff --git a/programs/oleview/pane.c b/programs/oleview/pane.c index 6943db4..4f5486d 100644 --- a/programs/oleview/pane.c +++ b/programs/oleview/pane.c @@ -99,6 +99,15 @@ LRESULT CALLBACK PaneProc(HWND hWnd, UIN if(GetCapture() == hWnd) DrawSplitMoving(hWnd, LOWORD(lParam)); break; + case WM_NOTIFY: + if((int)wParam != TYPELIB_TREE) break; + switch(((LPNMHDR)lParam)->code) + { + case TVN_SELCHANGED: + UpdateData(((NMTREEVIEW *)lParam)->itemNew.hItem); + break; + } + break; case WM_SIZE: if(wParam == SIZE_MINIMIZED) break; pane->width = LOWORD(lParam); diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 9eab7c4..1ccbca0 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -30,6 +30,15 @@ static const WCHAR wszTypeLib[] = { 'T', static const WCHAR wszFailed[] = { '<','f','a','i','l','e','d','>','\0' }; static const WCHAR wszSpace[] = { ' ','\0' }; static const WCHAR wszAsterix[] = { '*','\0' }; +static const WCHAR wszComa[] = { ',','\0' }; +static const WCHAR wszSemicolon[] = { ';','\0' }; +static const WCHAR wszNewLine[] = { '\n','\0' }; +static const WCHAR wszOpenBrackets1[] = { '[','\0' }; +static const WCHAR wszCloseBrackets1[] = { ']','\0' }; +static const WCHAR wszOpenBrackets2[] = { '(','\0' }; +static const WCHAR wszCloseBrackets2[] = { ')','\0' }; + +static const WCHAR wszUUID[] = { 'u','u','i','d','\0' }; static const WCHAR wszVT_BOOL[] = { 'V','A','R','I','A','N','T','_','B','O','O','L','\0' }; @@ -61,6 +70,29 @@ void AddToStrW(WCHAR *wszDest, const WCH lstrcpyW(&wszDest[lstrlenW(wszDest)], wszSource); } +void AddToTLDataStrW(TYPELIB_DATA *pTLData, const WCHAR *wszSource) +{ + int SourceLen = lstrlenW(wszSource); + + pTLData->idl = HeapReAlloc(GetProcessHeap(), 0, pTLData->idl, + sizeof(WCHAR)*(pTLData->idlLen+SourceLen+1)); + + memcpy(&pTLData->idl[pTLData->idlLen], wszSource, sizeof(WCHAR)*(SourceLen+1)); + pTLData->idlLen += SourceLen; +} + +LPARAM InitializeTLData(void) +{ + TYPELIB_DATA *pTLData; + + pTLData = HeapAlloc(GetProcessHeap(), 0, sizeof(TYPELIB_DATA)); + + memset(pTLData, 0, sizeof(TYPELIB_DATA)); + pTLData->idl = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)); + + return (LPARAM)pTLData; +} + void CreateTypeInfo(WCHAR *wszAddTo, WCHAR *wszAddAfter, TYPEDESC tdesc, ITypeInfo *pTypeInfo) { int i; @@ -241,6 +273,7 @@ int PopulateTree(void) { TVINSERTSTRUCT tvis; ITypeLib *pTypeLib; + TLIBATTR *pTLibAttr; ITypeInfo *pTypeInfo, *pRefTypeInfo; HREFTYPE hRefType; TYPEATTR *pTypeAttr; @@ -252,7 +285,15 @@ int PopulateTree(void) HRESULT hRes; HTREEITEM hParent; + const WCHAR wszGeneratedInfo[] = { '/','/',' ','G','e','n','e','r','a','t','e','d', + ' ','.','I','D','L',' ','f','i','l','e',' ','(','b','y',' ','t','h','e',' ', + 'O','L','E','/','C','O','M',' ','O','b','j','e','c','t',' ', + 'V','i','e','w','e','r',')','\n','/','/','\n','/','/',' ', + 't','y','p','e','l','i','b',' ','f','i','l','e','n','a','m','e',':',' ','\0'}; + const WCHAR wszFormat[] = { '%','s',' ','(','%','s',')','\0' }; + const WCHAR wszFormat2[] = { 'v','e','r','s','i','o','n', + '(','%','l','d','.','%','l','d',')','\0' }; const WCHAR wszTKIND_ENUM[] = { 't','y','p','e','d','e','f',' ','e','n','u','m',' ','\0' }; const WCHAR wszTKIND_RECORD[] @@ -266,7 +307,10 @@ int PopulateTree(void) const WCHAR wszTKIND_UNION[] = { 't','y','p','e','d','e','f',' ','u','n','i','o','n',' ','\0' }; - U(tvis).item.mask = TVIF_TEXT; + const WCHAR wszHelpString[] = { 'h','e','l','p','s','t','r','i','n','g','\0' }; + const WCHAR wszLibrary[] = { 'l','i','b','r','a','r','y',' ','\0' }; + + U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM; U(tvis).item.cchTextMax = MAX_LOAD_STRING; U(tvis).item.pszText = wszText; tvis.hInsertAfter = (HTREEITEM)TVI_LAST; @@ -286,6 +330,38 @@ int PopulateTree(void) count = ITypeLib_GetTypeInfoCount(pTypeLib); ITypeLib_GetDocumentation(pTypeLib, -1, &bstrName, &bstrData, NULL, NULL); + ITypeLib_GetLibAttr(pTypeLib, &pTLibAttr); + + U(tvis).item.lParam = InitializeTLData(); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszGeneratedInfo); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), typelib.wszFileName); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszNewLine); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszNewLine); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszOpenBrackets1); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszNewLine); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszUUID); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszOpenBrackets2); + StringFromGUID2(&(pTLibAttr->guid), wszText, MAX_LOAD_STRING); + wszText[lstrlenW(wszText)-1] = '\0'; + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), &wszText[1]); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszCloseBrackets2); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszComa); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszNewLine); + wsprintfW(wszText, wszFormat2, pTLibAttr->wMajorVerNum, pTLibAttr->wMinorVerNum); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszText); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszComa); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszNewLine); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszHelpString); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszOpenBrackets2); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), bstrData); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszCloseBrackets2); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszNewLine); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszCloseBrackets1); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszNewLine); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszLibrary); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), bstrName); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszNewLine); + wsprintfW(wszText, wszFormat, bstrName, bstrData); SysFreeString(bstrName); SysFreeString(bstrData); @@ -358,6 +434,20 @@ #define TKINDADDTOSTR(x) case x:\ return 0; } +void UpdateData(HTREEITEM item) +{ + TVITEM tvi; + + memset(&tvi, 0, sizeof(TVITEM)); + tvi.mask = TVIF_PARAM; + tvi.hItem = item; + + SendMessage(typelib.hTree, TVM_GETITEM, 0, (LPARAM)&tvi); + if(!tvi.lParam || !((TYPELIB_DATA*)tvi.lParam)->idlLen) return; + + SetWindowText(typelib.hEdit, ((TYPELIB_DATA*)tvi.lParam)->idl); +} + void TypeLibResizeChild(void) { RECT client, stat; @@ -412,7 +502,8 @@ LRESULT CALLBACK TypeLibProc(HWND hWnd, DestroyWindow(hWnd); typelib.hTree = CreateWindowEx(WS_EX_CLIENTEDGE, WC_TREEVIEW, NULL, WS_CHILD|WS_VISIBLE|TVS_HASLINES|TVS_HASBUTTONS|TVS_LINESATROOT, - 0, 0, 0, 0, typelib.hPaneWnd, NULL, globals.hMainInst, NULL); + 0, 0, 0, 0, typelib.hPaneWnd, (HMENU)TYPELIB_TREE, + globals.hMainInst, NULL); typelib.hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, WC_EDIT, NULL, WS_CHILD|WS_VISIBLE|ES_MULTILINE|ES_READONLY|WS_HSCROLL|WS_VSCROLL, 0, 0, 0, 0, typelib.hPaneWnd, NULL, globals.hMainInst, NULL);

1 0

Alexandre Julliard : server: Simplify process creation.
by Alexandre Julliard 19 Jul '06

19 Jul '06

Module: wine Branch: refs/heads/master Commit: c316f0e47fd75c8cc2ddf77b847d59b0e8f475d2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c316f0e47fd75c8cc2ddf77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 19 14:00:10 2006 +0200 server: Simplify process creation. Pass the socket for the new process from the parent through the environment. Perform initialisations during the new_process request. --- dlls/kernel/process.c | 206 ++++++++++++++++--------------------- dlls/ntdll/server.c | 23 +++- include/wine/server_protocol.h | 21 ++-- server/process.c | 220 +++++++++++++++++----------------------- server/process.h | 2 server/protocol.def | 37 +++---- server/request.c | 2 server/trace.c | 25 ++--- 8 files changed, 247 insertions(+), 289 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=c316f0e47fd75c8cc2d…

1 0

Alexandre Julliard : kernel: Added support for exec'ing a new Win32 process .
by Alexandre Julliard 19 Jul '06

19 Jul '06

Module: wine Branch: refs/heads/master Commit: 2cb0f43224db9e4ab8717ad0b1738c8debdb195e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2cb0f43224db9e4ab8717ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 19 14:12:58 2006 +0200 kernel: Added support for exec'ing a new Win32 process. Use it to restart execution if the main binary can't be loaded because of address space conflicts, and also for Win16/DOS support. --- dlls/kernel/process.c | 120 +++++++++++++++++++++++++++++++------------------ dlls/ntdll/virtual.c | 9 +--- 2 files changed, 80 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=2cb0f43224db9e4ab87…

1 0

Alexandre Julliard : kernel: Simplify set_process_name now that it doesn' t have to handle winevdm.
by Alexandre Julliard 19 Jul '06

19 Jul '06

Module: wine Branch: refs/heads/master Commit: 763e96abaea6d31a0f387ec2c0002f83da24ae6b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=763e96abaea6d31a0f387ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 19 15:04:57 2006 +0200 kernel: Simplify set_process_name now that it doesn't have to handle winevdm. --- dlls/kernel/process.c | 55 +++++++++++++------------------------------------ 1 files changed, 15 insertions(+), 40 deletions(-) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index 307c50a..a2ab351 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -463,6 +463,7 @@ static void set_library_wargv( char **ar } argv[argc] = NULL; + __wine_main_argc = argc; __wine_main_argv = argv; __wine_main_wargv = wargv; } @@ -816,59 +817,33 @@ static void start_process( void *arg ) * * Change the process name in the ps output. */ -static void set_process_name( int *argc, char *argv[], char *name ) +static void set_process_name( int argc, char *argv[] ) { #ifdef HAVE_PRCTL int i, offset; - char *prctl_name = NULL; - char *end = argv[*argc-1] + strlen(argv[*argc-1]) + 1; + char *p, *prctl_name = argv[1]; + char *end = argv[argc-1] + strlen(argv[argc-1]) + 1; #ifndef PR_SET_NAME # define PR_SET_NAME 15 #endif - if (!name) - { - char *p; - prctl_name = argv[1]; - if ((p = strrchr( prctl_name, '\\' ))) prctl_name = p + 1; - if ((p = strrchr( prctl_name, '/' ))) prctl_name = p + 1; - } - else - { - if (strlen(name) <= strlen(argv[0])) prctl_name = name; - } + if ((p = strrchr( prctl_name, '\\' ))) prctl_name = p + 1; + if ((p = strrchr( prctl_name, '/' ))) prctl_name = p + 1; - if (prctl_name && prctl( PR_SET_NAME, prctl_name ) != -1) + if (prctl( PR_SET_NAME, prctl_name ) != -1) { - if (name) - { - strcpy( argv[0], name ); - offset = argv[1] - (argv[0] + strlen(name) + 1); - memmove( argv[1] - offset, argv[1], end - argv[1] ); - memset( end - offset, 0, offset ); - for (i = 1; i < *argc; i++) argv[i] -= offset; - } - else - { - offset = argv[1] - argv[0]; - memmove( argv[1] - offset, argv[1], end - argv[1] ); - memset( end - offset, 0, offset ); - for (i = 1; i < *argc; i++) argv[i-1] = argv[i] - offset; - argv[i-1] = NULL; - (*argc)--; - } + offset = argv[1] - argv[0]; + memmove( argv[1] - offset, argv[1], end - argv[1] ); + memset( end - offset, 0, offset ); + for (i = 1; i < argc; i++) argv[i-1] = argv[i] - offset; + argv[i-1] = NULL; } else #endif /* HAVE_PRCTL */ { - if (name) argv[0] = name; - else - { - /* remove argv[0] */ - memmove( argv, argv + 1, *argc * sizeof(argv[0]) ); - (*argc)--; - } + /* remove argv[0] */ + memmove( argv, argv + 1, argc * sizeof(argv[0]) ); } } @@ -888,7 +863,7 @@ void __wine_kernel_init(void) /* Initialize everything */ if (!process_init()) exit(1); - set_process_name( &__wine_main_argc, __wine_main_argv, NULL ); + set_process_name( __wine_main_argc, __wine_main_argv ); set_library_wargv( __wine_main_argv ); if (peb->ProcessParameters->ImagePathName.Buffer)

1 0

Alexandre Julliard : preloader: Make sure the WINEPRELOADRESERVE area doesn 't overlap the low memory area.
by Alexandre Julliard 19 Jul '06

19 Jul '06

Module: wine Branch: refs/heads/master Commit: 875b5db17bbedaeed7044bd81494d72f43f7a545 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=875b5db17bbedaeed7044bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 19 15:06:16 2006 +0200 preloader: Make sure the WINEPRELOADRESERVE area doesn't overlap the low memory area. --- loader/preloader.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 274d858..d9b749c 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -847,6 +847,12 @@ static void preload_reserve( const char start = end = NULL; } + /* check for overlap with low memory area */ + if ((char *)end <= (char *)preload_info[0].addr + preload_info[0].size) + start = end = NULL; + else if ((char *)start < (char *)preload_info[0].addr + preload_info[0].size) + start = (char *)preload_info[0].addr + preload_info[0].size; + /* entry 2 is for the PE exe */ preload_info[2].addr = start; preload_info[2].size = (char *)end - (char *)start;

1 0

Jeff Latimer : usp10: Add ScriptStringCPtoX and ScriptStringXtoCP stubs.
by Alexandre Julliard 19 Jul '06

19 Jul '06

Module: wine Branch: refs/heads/master Commit: ac40febae2a1f1e8f1cc15d18e17d0cdef13ae86 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac40febae2a1f1e8f1cc15d… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Jul 18 19:35:07 2006 +1000 usp10: Add ScriptStringCPtoX and ScriptStringXtoCP stubs. --- dlls/usp10/usp10.c | 23 +++++++++++++++++++++++ dlls/usp10/usp10.spec | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 4bf7031..abd9c89 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -317,6 +317,29 @@ HRESULT WINAPI ScriptStringOut(SCRIPT_ST } /*********************************************************************** + * ScriptStringCPtoX (USP10.@) + * + */ +HRESULT WINAPI ScriptStringCPtoX(SCRIPT_STRING_ANALYSIS ssa, int icp, BOOL fTrailing, int* pX) +{ + FIXME("(%p), %d, %d, (%p): stub\n", ssa, icp, fTrailing, pX); + *pX = 0; /* Set a reasonable value */ + return S_OK; +} + +/*********************************************************************** + * ScriptStringXtoCP (USP10.@) + * + */ +HRESULT WINAPI ScriptStringXtoCP(SCRIPT_STRING_ANALYSIS ssa, int iX, int* piCh, int* piTrailing) +{ + FIXME("(%p), %d, (%p), (%p): stub\n", ssa, iX, piCh, piTrailing); + *piCh = 0; /* Set a reasonable value */ + *piTrailing = 0; + return S_OK; +} + +/*********************************************************************** * ScriptStringFree (USP10.@) * */ diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index 22ee688..c4e47fc 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -18,13 +18,13 @@ @ stdcall ScriptRecordDigitSubstitution(ptr ptr) @ stdcall ScriptShape(ptr ptr ptr long long ptr ptr ptr ptr ptr) @ stdcall ScriptStringAnalyse(ptr ptr long long long long long ptr ptr ptr ptr ptr ptr) -@ stub ScriptStringCPtoX +@ stdcall ScriptStringCPtoX(ptr long long ptr) @ stdcall ScriptStringFree(ptr) @ stub ScriptStringGetLogicalWidths @ stub ScriptStringGetOrder @ stdcall ScriptStringOut(ptr long long long ptr long long long) @ stub ScriptStringValidate -@ stub ScriptStringXtoCP +@ stdcall ScriptStringXtoCP(ptr long ptr ptr) @ stub ScriptString_pLogAttr @ stub ScriptString_pSize @ stub ScriptString_pcOutChars

1 0

appdb/include query.php
by WineHQ 19 Jul '06

19 Jul '06

ChangeSet ID: 26652 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/19 12:18:16 Modified files: include : query.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Swap error logging and addmsg() calls as addmsg() performs a database transaction and will clear out any error that we wanted to report when error logging and calling mysql_error() Patch: http://cvs.winehq.org/patch.py?id=26652 Old revision New revision Changes Path 1.4 1.5 +2 -2 appdb/include/query.php Index: appdb/include/query.php diff -u -p appdb/include/query.php:1.4 appdb/include/query.php:1.5 --- appdb/include/query.php:1.4 19 Jul 2006 17:18:16 -0000 +++ appdb/include/query.php 19 Jul 2006 17:18:16 -0000 @@ -113,10 +113,10 @@ function query_bugzilladb($sQuery,$sComm function query_error($sQuery, $sComment="") { + error_log::log_error(ERROR_SQL, "Query: '".$sQuery."' mysql_error(): '".mysql_error()."' comment: '".$sComment."'"); + $sStatusMessage = "<p><b>An internal error has occurred and has been logged and reported to appdb admins</b></p>"; addmsg($sStatusMessage); - - error_log::log_error(ERROR_SQL, "Query: '".$sQuery."' mysql_error(): '".mysql_error()."' comment: '".$sComment."'"); } ?>

1 0

appdb/ cron/cleanup.php include/incl.php inclu ...
by WineHQ 19 Jul '06

19 Jul '06

ChangeSet ID: 26651 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/19 11:37:54 Modified files: cron : cleanup.php include : incl.php query.php tables : create_tables unit_test : run_tests.php Added files: include : error_log.php tables : error_log.sql unit_test : test_error_log.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Modify query_error() to log errors to a database table instead of displaying them on the screen. This should let us more easily debug difficult or intermittent issues that users may not report. Add a cron to report logged errors to appdb admins every night. Implement some basic unit tests for the new error logging code Patch: http://cvs.winehq.org/patch.py?id=26651 Old revision New revision Changes Path 1.29 1.30 +10 -1 appdb/cron/cleanup.php 1.36 1.37 +1 -0 appdb/include/incl.php 1.3 1.4 +4 -5 appdb/include/query.php Added 1.1 +0 -0 appdb/include/error_log.php 1.7 1.8 +2 -0 appdb/tables/create_tables Added 1.1 +0 -0 appdb/tables/error_log.sql 1.4 1.5 +3 -1 appdb/unit_test/run_tests.php Added 1.1 +0 -0 appdb/unit_test/test_error_log.php

1 0