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

Ivan Gyurdiev : wined3d: Move SHADER_ARB code into arb_program_shader.c.
by Alexandre Julliard July 3, 2006

July 3, 2006

Module: wine Branch: refs/heads/master Commit: d06e13db9961b747943782bd4606fdea23a12ebb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d06e13db9961b747943782b… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Sun Jul 2 19:27:15 2006 -0600 wined3d: Move SHADER_ARB code into arb_program_shader.c. --- dlls/wined3d/arb_program_shader.c | 704 +++++++++++++++++++++++++++++++++++++ dlls/wined3d/pixelshader.c | 504 -------------------------- dlls/wined3d/vertexshader.c | 222 ------------ dlls/wined3d/wined3d_private.h | 20 + 4 files changed, 723 insertions(+), 727 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=d06e13db9961b747943…

1 0

Ivan Gyurdiev : d3d9: Fix FVF POSITION mask.
by Alexandre Julliard July 3, 2006

July 3, 2006

Module: wine Branch: refs/heads/master Commit: 61f1de1b85854d721d8ee2a96e6eb42e31ab3ee0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=61f1de1b85854d721d8ee2a… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Mon Jul 3 00:10:24 2006 -0600 d3d9: Fix FVF POSITION mask. --- include/d3d9types.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3d9types.h b/include/d3d9types.h index 628d2f3..adcfa52 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -133,7 +133,7 @@ #define D3DWRAPCOORD_3 8 #define MAX_DEVICE_IDENTIFIER_STRING 512 #define D3DFVF_RESERVED0 0x0001 -#define D3DFVF_POSITION_MASK 0x4000E +#define D3DFVF_POSITION_MASK 0x000E #define D3DFVF_XYZ 0x0002 #define D3DFVF_XYZRHW 0x0004 #define D3DFVF_XYZB1 0x0006

1 0

Ivan Gyurdiev : wined3d: Cleanup: print constants in device code.
by Alexandre Julliard July 3, 2006

July 3, 2006

Module: wine Branch: refs/heads/master Commit: fce0c625f00998dced369e436e83750f60843f1d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fce0c625f00998dced369e4… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Sun Jul 2 19:26:03 2006 -0600 wined3d: Cleanup: print constants in device code. --- dlls/wined3d/device.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 087ba92..6b2ae6e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4681,6 +4681,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3DERR_INVALIDCALL; memcpy(&This->updateStateBlock->vertexShaderConstantB[start], srcData, cnt * sizeof(BOOL)); + for (i = 0; i < cnt; i++) + TRACE("Set BOOL constant %u to %s\n", i, srcData[i]? "true":"false"); for (i = start; i < cnt + start; ++i) { This->updateStateBlock->changed.vertexShaderConstantsB[i] = TRUE; @@ -4725,6 +4727,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3DERR_INVALIDCALL; memcpy(&This->updateStateBlock->vertexShaderConstantI[start * 4], srcData, cnt * sizeof(int) * 4); + for (i = 0; i < cnt; i++) + TRACE("Set INT constant %u to { %d, %d, %d, %d }\n", i, + srcData[i*4], srcData[i*4+1], srcData[i*4+2], srcData[i*4+3]); for (i = start; i < cnt + start; ++i) { This->updateStateBlock->changed.vertexShaderConstantsI[i] = TRUE; @@ -4769,6 +4774,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3DERR_INVALIDCALL; memcpy(&This->updateStateBlock->vertexShaderConstantF[start * 4], srcData, cnt * sizeof(float) * 4); + for (i = 0; i < cnt; i++) + TRACE("Set FLOAT constant %u to { %f, %f, %f, %f }\n", i, + srcData[i*4], srcData[i*4+1], srcData[i*4+2], srcData[i*4+3]); for (i = start; i < cnt + start; ++i) { This->updateStateBlock->changed.vertexShaderConstantsF[i] = TRUE; @@ -4855,6 +4863,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3DERR_INVALIDCALL; memcpy(&This->updateStateBlock->pixelShaderConstantB[start], srcData, cnt * sizeof(BOOL)); + for (i = 0; i < cnt; i++) + TRACE("Set BOOL constant %u to %s\n", i, srcData[i]? "true":"false"); for (i = start; i < cnt + start; ++i) { This->updateStateBlock->changed.pixelShaderConstantsB[i] = TRUE; @@ -4899,6 +4909,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3DERR_INVALIDCALL; memcpy(&This->updateStateBlock->pixelShaderConstantI[start * 4], srcData, cnt * sizeof(int) * 4); + for (i = 0; i < cnt; i++) + TRACE("Set INT constant %u to { %d, %d, %d, %d }\n", i, + srcData[i*4], srcData[i*4+1], srcData[i*4+2], srcData[i*4+3]); for (i = start; i < cnt + start; ++i) { This->updateStateBlock->changed.pixelShaderConstantsI[i] = TRUE; @@ -4943,6 +4956,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3DERR_INVALIDCALL; memcpy(&This->updateStateBlock->pixelShaderConstantF[start * 4], srcData, cnt * sizeof(float) * 4); + for (i = 0; i < cnt; i++) + TRACE("Set FLOAT constant %u to { %f, %f, %f, %f }\n", i, + srcData[i*4], srcData[i*4+1], srcData[i*4+2], srcData[i*4+3]); for (i = start; i < cnt + start; ++i) { This->updateStateBlock->changed.pixelShaderConstantsF[i] = TRUE;

1 0

Piotr Caban : oleview: Added next field to TypeLib viewer treeview control.
by Alexandre Julliard July 3, 2006

July 3, 2006

Module: wine Branch: refs/heads/master Commit: 77895b701b9b4f0f85c8effe3632a384114a7af4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=77895b701b9b4f0f85c8eff… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 2 19:44:39 2006 +0200 oleview: Added next field to TypeLib viewer treeview control. --- programs/oleview/typelib.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 3eae6ea..1875992 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -94,7 +94,8 @@ int PopulateTree(void) { TVINSERTSTRUCT tvis; ITypeLib *pTypeLib; - ITypeInfo *pTypeInfo; + ITypeInfo *pTypeInfo, *pRefTypeInfo; + HREFTYPE hRefType; TYPEATTR *pTypeAttr; INT count, i; BSTR bstrName; @@ -161,9 +162,24 @@ #define TKINDADDTOSTR(x) case x:\ TKINDADDTOSTR(TKIND_RECORD); TKINDADDTOSTR(TKIND_MODULE); TKINDADDTOSTR(TKIND_INTERFACE); - TKINDADDTOSTR(TKIND_DISPATCH); TKINDADDTOSTR(TKIND_COCLASS); TKINDADDTOSTR(TKIND_UNION); + case TKIND_DISPATCH: + AddToStrW(wszText, wszTKIND_DISPATCH); + AddToStrW(wszText, bstrName); + if(SUCCEEDED(ITypeInfo_GetRefTypeOfImplType(pTypeInfo, -1, &hRefType))) + { + SendMessage(typelib.hTree, TVM_INSERTITEM, 0, (LPARAM)&tvis); + memset(wszText, 0, sizeof(wszText)); + + ITypeInfo_GetRefTypeInfo(pTypeInfo, hRefType, &pRefTypeInfo); + ITypeInfo_GetDocumentation(pRefTypeInfo, MEMBERID_NIL, &bstrName, + NULL, NULL, NULL); + AddToStrW(wszText, wszTKIND_INTERFACE); + AddToStrW(wszText, bstrName); + ITypeInfo_Release(pRefTypeInfo); + } + break; case TKIND_ALIAS: AddToStrW(wszText, wszTKIND_ALIAS); CreateTypeInfo(wszText, pTypeAttr->tdescAlias, pTypeInfo);

1 0

Piotr Caban : oleview: Improved type handling in TypeLib viewer.
by Alexandre Julliard July 3, 2006

July 3, 2006

Module: wine Branch: refs/heads/master Commit: 221521ca94ac1416dde73d79e8c31f172963bb95 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=221521ca94ac1416dde73d7… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 2 19:43:30 2006 +0200 oleview: Improved type handling in TypeLib viewer. --- programs/oleview/typelib.c | 102 +++++++++++++++++++++++++++++--------------- 1 files changed, 67 insertions(+), 35 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 3fb8689..3eae6ea 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -20,19 +20,81 @@ #include "main.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(oleview); + TYPELIB typelib; static const WCHAR wszTypeLib[] = { 'T','Y','P','E','L','I','B','\0' }; +static const WCHAR wszFailed[] = { '<','f','a','i','l','e','d','>','\0' }; +static const WCHAR wszSpace[] = { ' ','\0' }; +static const WCHAR wszAsterix[] = { '*','\0' }; + +static const WCHAR wszVT_BOOL[] + = { 'V','A','R','I','A','N','T','_','B','O','O','L','\0' }; +static const WCHAR wszVT_UI1[] + = { 'u','n','s','i','g','n','e','d',' ','c','h','a','r','\0' }; +static const WCHAR wszVT_UI4[] + = { 'u','n','s','i','g','n','e','d',' ','l','o','n','g','\0' }; +static const WCHAR wszVT_I4[] = { 'l','o','n','g','\0' }; +static const WCHAR wszVT_R4[] = { 's','i','n','g','l','e','\0' }; +static const WCHAR wszVT_INT[] = { 'i','n','t','\0' }; +static const WCHAR wszVT_BSTR[] = { 'B','S','T','R','\0' }; +static const WCHAR wszVT_CY[] = { 'C','U','R','R','E','N','C','Y','\0' }; + void AddToStrW(WCHAR *wszDest, const WCHAR *wszSource) { lstrcpyW(&wszDest[lstrlenW(wszDest)], wszSource); } +void CreateTypeInfo(WCHAR *wszAddTo, TYPEDESC tdesc, ITypeInfo *pTypeInfo) +{ + BSTR bstrData; + HRESULT hRes; + ITypeInfo *pRefTypeInfo; + + switch(tdesc.vt&VT_TYPEMASK) + { +#define VTADDTOSTR(x) case x:\ + AddToStrW(wszAddTo, wsz##x);\ + break + VTADDTOSTR(VT_BOOL); + VTADDTOSTR(VT_UI1); + VTADDTOSTR(VT_UI4); + VTADDTOSTR(VT_I4); + VTADDTOSTR(VT_R4); + VTADDTOSTR(VT_INT); + VTADDTOSTR(VT_BSTR); + VTADDTOSTR(VT_CY); + case VT_PTR: + CreateTypeInfo(wszAddTo, *U(tdesc).lptdesc, pTypeInfo); + AddToStrW(wszAddTo, wszAsterix); + break; + case VT_USERDEFINED: + hRes = ITypeInfo_GetRefTypeInfo(pTypeInfo, + U(tdesc).hreftype, &pRefTypeInfo); + if(SUCCEEDED(hRes)) + { + ITypeInfo_GetDocumentation(pRefTypeInfo, MEMBERID_NIL, + &bstrData, NULL, NULL, NULL); + AddToStrW(wszAddTo, bstrData); + SysFreeString(bstrData); + ITypeInfo_Release(pRefTypeInfo); + } + else AddToStrW(wszAddTo, wszFailed); + break; + default: + WINE_FIXME("tdesc.vt&VT_TYPEMASK == %d not supported\n", + tdesc.vt&VT_TYPEMASK); + } +} + int PopulateTree(void) { TVINSERTSTRUCT tvis; ITypeLib *pTypeLib; - ITypeInfo *pTypeInfo, *pRefTypeInfo; + ITypeInfo *pTypeInfo; TYPEATTR *pTypeAttr; INT count, i; BSTR bstrName; @@ -41,7 +103,6 @@ int PopulateTree(void) HRESULT hRes; const WCHAR wszFormat[] = { '%','s',' ','(','%','s',')','\0' }; - const WCHAR wszSpace[] = { ' ','\0' }; const WCHAR wszTKIND_ENUM[] = { 't','y','p','e','d','e','f',' ','e','n','u','m',' ','\0' }; const WCHAR wszTKIND_RECORD[] @@ -55,14 +116,6 @@ int PopulateTree(void) const WCHAR wszTKIND_UNION[] = { 't','y','p','e','d','e','f',' ','u','n','i','o','n',' ','\0' }; - const WCHAR wszVT_BOOL[] = { 'V','A','R','I','A','N','T','_','B','O','O','L',' ','\0' }; - const WCHAR wszVT_UI4[] = { 'u','n','s','i','g','n','e','d',' ','l','o','n','g',' ','\0' }; - const WCHAR wszVT_I4[] = { 'l','o','n','g',' ','\0' }; - const WCHAR wszVT_R4[] = { 's','i','n','g','l','e',' ','\0' }; - const WCHAR wszVT_INT[] = { 'i','n','t',' ','\0' }; - const WCHAR wszVT_BSTR[] = { 'B','S','T','R',' ','\0' }; - const WCHAR wszVT_CY[] = { 'C','U','R','R','E','N','C','Y',' ','\0' }; - U(tvis).item.mask = TVIF_TEXT|TVIF_CHILDREN; U(tvis).item.cchTextMax = MAX_LOAD_STRING; U(tvis).item.pszText = wszText; @@ -81,7 +134,6 @@ int PopulateTree(void) MessageBox(globals.hMainWnd, wszMessage, NULL, MB_OK|MB_ICONEXCLAMATION); return 1; } - count = ITypeLib_GetTypeInfoCount(pTypeLib); ITypeLib_GetDocumentation(pTypeLib, -1, &bstrName, &bstrData, NULL, NULL); @@ -114,36 +166,16 @@ #define TKINDADDTOSTR(x) case x:\ TKINDADDTOSTR(TKIND_UNION); case TKIND_ALIAS: AddToStrW(wszText, wszTKIND_ALIAS); - - switch(pTypeAttr->tdescAlias.vt&VT_TYPEMASK) - { -#define VTADDTOSTR(x) case x:\ - AddToStrW(wszText, wsz##x);\ - break - VTADDTOSTR(VT_BOOL); - VTADDTOSTR(VT_UI4); - VTADDTOSTR(VT_I4); - VTADDTOSTR(VT_R4); - VTADDTOSTR(VT_INT); - VTADDTOSTR(VT_BSTR); - VTADDTOSTR(VT_CY); - case VT_USERDEFINED: - ITypeInfo_GetRefTypeInfo(pTypeInfo, U(pTypeAttr->tdescAlias).hreftype, &pRefTypeInfo); - ITypeInfo_GetDocumentation(pRefTypeInfo, MEMBERID_NIL, &bstrData, NULL, NULL, NULL); - AddToStrW(wszText, bstrData); - AddToStrW(wszText, wszSpace); - SysFreeString(bstrData); - ITypeInfo_Release(pRefTypeInfo); - break; - } - + CreateTypeInfo(wszText, pTypeAttr->tdescAlias, pTypeInfo); + AddToStrW(wszText, wszSpace); AddToStrW(wszText, bstrName); break; default: lstrcpyW(wszText, bstrName); + WINE_FIXME("pTypeAttr->typekind == %d\n not supported", + pTypeAttr->typekind); } SendMessage(typelib.hTree, TVM_INSERTITEM, 0, (LPARAM)&tvis); - ITypeInfo_ReleaseTypeAttr(pTypeInfo, pTypeAttr); ITypeInfo_Release(pTypeInfo); SysFreeString(bstrName);

1 0

Piotr Caban : oleview: Added open TypeLib file functionality.
by Alexandre Julliard July 3, 2006

July 3, 2006

Module: wine Branch: refs/heads/master Commit: ecd514d5d6b9b0457f64cbebbd8c93a6fbfa2485 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ecd514d5d6b9b0457f64cbe… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 2 13:04:26 2006 +0200 oleview: Added open TypeLib file functionality. --- programs/oleview/En.rc | 1 + programs/oleview/Makefile.in | 2 +- programs/oleview/main.h | 3 ++- programs/oleview/oleview.c | 36 +++++++++++++++++++++++++++++++++++- programs/oleview/resource.h | 2 ++ programs/oleview/typelib.c | 23 +++++++++++++++-------- 6 files changed, 56 insertions(+), 11 deletions(-) diff --git a/programs/oleview/En.rc b/programs/oleview/En.rc index f5b3a28..dfb09aa 100644 --- a/programs/oleview/En.rc +++ b/programs/oleview/En.rc @@ -95,6 +95,7 @@ STRINGTABLE IDS_ABOUT "OleView - OLE/COM Object Viewer" IDS_ABOUTVER "version 1.0" IDS_TYPELIBTITLE "ITypeLib viewer" + IDS_OPEN "Open" IDM_BIND, "Bind to file via a File Moniker" IDM_TYPELIB, "Open a TypeLib file and view the contents" diff --git a/programs/oleview/Makefile.in b/programs/oleview/Makefile.in index 2df5004..00fc481 100644 --- a/programs/oleview/Makefile.in +++ b/programs/oleview/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = oleview.exe APPMODE = -mwindows -municode -IMPORTS = comctl32 shell32 oleaut32 ole32 user32 advapi32 kernel32 +IMPORTS = comdlg32 comctl32 shell32 oleaut32 ole32 user32 advapi32 kernel32 EXTRALIBS = -luuid EXTRADEFS = -DUNICODE diff --git a/programs/oleview/main.h b/programs/oleview/main.h index ad200fb..689e01f 100644 --- a/programs/oleview/main.h +++ b/programs/oleview/main.h @@ -108,6 +108,7 @@ typedef struct HWND hTree; HWND hEdit; HWND hStatusBar; + WCHAR wszFileName[MAX_LOAD_STRING]; }TYPELIB; extern GLOBALS globals; @@ -138,7 +139,7 @@ void CreateInst(HTREEITEM item, WCHAR *w void ReleaseInst(HTREEITEM item); /* typelib.c */ -BOOL CreateTypeLibWindow(HINSTANCE hInst); +BOOL CreateTypeLibWindow(HINSTANCE hInst, WCHAR *wszFileName); BOOL TypeLibRegisterClass(void); /* interface.c */ diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index 73980b2..88ce725 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -25,6 +25,13 @@ static WCHAR wszRegEdit[] = { 'r','e','g static WCHAR wszFormat[] = { '<','o','b','j','e','c','t','\n',' ',' ',' ', 'c','l','a','s','s','i','d','=','\"','c','l','s','i','d',':','%','s','\"','\n', '>','\n','<','/','o','b','j','e','c','t','>','\0' }; +WCHAR wszFilter[] = { 'T','y','p','e','L','i','b',' ','F','i','l','e','s',' ', + '(','*','t','l','b',';','*','o','l','b',';','*','.','d','l','l',';', + '*','.','o','c','x',';','*','.','e','x','e',')','\0', + '*','.','t','l','b',';','*','.','o','l','b',';','*','.','d','l','l',';', + '*','.','o','c','x','*','.','e','x','e','\0', + 'A','l','l',' ','F','i','l','e','s',' ','(','*','.','*',')','\0', + '*','.','*','\0','\0' }; INT_PTR CALLBACK SysConfProc(HWND hDlgWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -124,6 +131,22 @@ INT_PTR CALLBACK CreateInstOnProc(HWND h return FALSE; } +void InitOpenFileName(HWND hWnd, OPENFILENAME *pofn, WCHAR *wszFilter, + WCHAR *wszTitle, WCHAR *wszFileName) +{ + memset(pofn, 0, sizeof(OPENFILENAME)); + pofn->lStructSize = sizeof(OPENFILENAME); + pofn->hwndOwner = hWnd; + pofn->hInstance = globals.hMainInst; + + pofn->lpstrTitle = wszTitle; + pofn->lpstrFilter = wszFilter; + pofn->nFilterIndex = 0; + pofn->lpstrFile = wszFileName; + pofn->nMaxFile = MAX_LOAD_STRING; + pofn->Flags = OFN_HIDEREADONLY; +} + void CopyClsid(HTREEITEM item) { TVITEM tvi; @@ -380,10 +403,21 @@ int MenuCommand(WPARAM wParam, HWND hWnd vis ? MF_UNCHECKED : MF_CHECKED); ResizeChild(); break; + case IDM_TYPELIB: + { + OPENFILENAME ofn; + static WCHAR wszTitle[MAX_LOAD_STRING]; + static WCHAR wszName[MAX_LOAD_STRING]; + + LoadString(globals.hMainInst, IDS_OPEN, wszTitle, sizeof(wszTitle)); + InitOpenFileName(hWnd, &ofn, wszFilter, wszTitle, wszName); + if(GetOpenFileName(&ofn)) CreateTypeLibWindow(globals.hMainInst, wszName); + break; + } case IDM_VIEW: hSelect = TreeView_GetSelection(globals.hTree); if(IsInterface(hSelect)) InterfaceViewer(hSelect); - else CreateTypeLibWindow(globals.hMainInst); + else CreateTypeLibWindow(globals.hMainInst, NULL); break; case IDM_EXIT: DestroyWindow(hWnd); diff --git a/programs/oleview/resource.h b/programs/oleview/resource.h index 5d7818b..73cde3d 100644 --- a/programs/oleview/resource.h +++ b/programs/oleview/resource.h @@ -29,6 +29,8 @@ #define IDS_READY 10 #define IDS_ABOUT 20 #define IDS_ABOUTVER 21 +#define IDS_OPEN 30 + #define IDM_BIND 100 #define IDM_TYPELIB 101 #define IDM_SYSCONF 102 diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 09275f4..3fb8689 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -30,7 +30,6 @@ void AddToStrW(WCHAR *wszDest, const WCH int PopulateTree(void) { - TVITEM tvi; TVINSERTSTRUCT tvis; ITypeLib *pTypeLib; ITypeInfo *pTypeInfo, *pRefTypeInfo; @@ -64,9 +63,6 @@ int PopulateTree(void) const WCHAR wszVT_BSTR[] = { 'B','S','T','R',' ','\0' }; const WCHAR wszVT_CY[] = { 'C','U','R','R','E','N','C','Y',' ','\0' }; - memset(&tvi, 0, sizeof(TVITEM)); - tvi.hItem = TreeView_GetSelection(globals.hTree); - U(tvis).item.mask = TVIF_TEXT|TVIF_CHILDREN; U(tvis).item.cchTextMax = MAX_LOAD_STRING; U(tvis).item.pszText = wszText; @@ -74,15 +70,14 @@ int PopulateTree(void) tvis.hInsertAfter = (HTREEITEM)TVI_LAST; tvis.hParent = TVI_ROOT; - SendMessage(globals.hTree, TVM_GETITEM, 0, (LPARAM)&tvi); - if(FAILED((hRes = LoadTypeLib(((ITEM_INFO*)tvi.lParam)->path, &pTypeLib)))) + if(FAILED((hRes = LoadTypeLib(typelib.wszFileName, &pTypeLib)))) { WCHAR wszMessage[MAX_LOAD_STRING]; WCHAR wszError[MAX_LOAD_STRING]; LoadString(globals.hMainInst, IDS_ERROR_LOADTYPELIB, wszError, sizeof(WCHAR[MAX_LOAD_STRING])); - wsprintfW(wszMessage, wszError, ((ITEM_INFO*)tvi.lParam)->path, hRes); + wsprintfW(wszMessage, wszError, typelib.wszFileName, hRes); MessageBox(globals.hMainWnd, wszMessage, NULL, MB_OK|MB_ICONEXCLAMATION); return 1; } @@ -261,11 +256,23 @@ BOOL TypeLibRegisterClass(void) return TRUE; } -BOOL CreateTypeLibWindow(HINSTANCE hInst) +BOOL CreateTypeLibWindow(HINSTANCE hInst, WCHAR *wszFileName) { WCHAR wszTitle[MAX_LOAD_STRING]; LoadString(hInst, IDS_TYPELIBTITLE, wszTitle, sizeof(WCHAR[MAX_LOAD_STRING])); + if(wszFileName) lstrcpyW(typelib.wszFileName, wszFileName); + else + { + TVITEM tvi; + + memset(&tvi, 0, sizeof(TVITEM)); + tvi.hItem = TreeView_GetSelection(globals.hTree); + + SendMessage(globals.hTree, TVM_GETITEM, 0, (LPARAM)&tvi); + lstrcpyW(typelib.wszFileName, ((ITEM_INFO*)tvi.lParam)->path); + } + globals.hTypeLibWnd = CreateWindow(wszTypeLib, wszTitle, WS_OVERLAPPEDWINDOW|WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 800, 600, NULL, NULL, hInst, NULL);

1 0

Piotr Caban : oleview: Added type displaying in TypeLib Viewer.
by Alexandre Julliard July 3, 2006

July 3, 2006

Module: wine Branch: refs/heads/master Commit: fa7e97e80def8d0f305f6211f6d1b7d7274b0f59 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fa7e97e80def8d0f305f621… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 2 13:03:09 2006 +0200 oleview: Added type displaying in TypeLib Viewer. --- programs/oleview/En.rc | 8 ++- programs/oleview/resource.h | 2 + programs/oleview/typelib.c | 121 +++++++++++++++++++++++++++++++++++++++---- 3 files changed, 116 insertions(+), 15 deletions(-) diff --git a/programs/oleview/En.rc b/programs/oleview/En.rc index b792716..f5b3a28 100644 --- a/programs/oleview/En.rc +++ b/programs/oleview/En.rc @@ -137,9 +137,11 @@ STRINGTABLE IDS_CGCOFAIL, "CoGetClassObject failed." IDS_ERROR_UNKN, "Unknown error" - IDS_TRUE "True" - IDS_FALSE "False" - IDS_BYTES "bytes" + IDS_TRUE, "True" + IDS_FALSE, "False" + IDS_BYTES, "bytes" + + IDS_ERROR_LOADTYPELIB, "LoadTypeLib( %s ) failed ($%x)" } DLG_CREATEINSTON DIALOG DISCARDABLE 0, 0, 250, 41 diff --git a/programs/oleview/resource.h b/programs/oleview/resource.h index 123427e..5d7818b 100644 --- a/programs/oleview/resource.h +++ b/programs/oleview/resource.h @@ -73,6 +73,8 @@ #define IDS_TRUE 310 #define IDS_FALSE 311 #define IDS_BYTES 312 +#define IDS_ERROR_LOADTYPELIB 400 + #define DLG_CREATEINSTON 1000 #define IDC_MACHINE 1001 diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index f6b3e23..09275f4 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -23,43 +23,140 @@ #include "main.h" TYPELIB typelib; static const WCHAR wszTypeLib[] = { 'T','Y','P','E','L','I','B','\0' }; -void PopulateTree(void) +void AddToStrW(WCHAR *wszDest, const WCHAR *wszSource) +{ + lstrcpyW(&wszDest[lstrlenW(wszDest)], wszSource); +} + +int PopulateTree(void) { TVITEM tvi; TVINSERTSTRUCT tvis; ITypeLib *pTypeLib; + ITypeInfo *pTypeInfo, *pRefTypeInfo; + TYPEATTR *pTypeAttr; INT count, i; BSTR bstrName; + BSTR bstrData; + WCHAR wszText[MAX_LOAD_STRING]; + HRESULT hRes; + + const WCHAR wszFormat[] = { '%','s',' ','(','%','s',')','\0' }; + const WCHAR wszSpace[] = { ' ','\0' }; + + const WCHAR wszTKIND_ENUM[] = { 't','y','p','e','d','e','f',' ','e','n','u','m',' ','\0' }; + const WCHAR wszTKIND_RECORD[] + = { 't','y','p','e','d','e','f',' ','s','t','r','u','c','t',' ','\0' }; + const WCHAR wszTKIND_MODULE[] = { 'm','o','d','u','l','e',' ','\0' }; + 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 wszTKIND_COCLASS[] = { 'c','o','c','l','a','s','s',' ','\0' }; + const WCHAR wszTKIND_ALIAS[] = { 't','y','p','e','d','e','f',' ','\0' }; + const WCHAR wszTKIND_UNION[] + = { 't','y','p','e','d','e','f',' ','u','n','i','o','n',' ','\0' }; + + const WCHAR wszVT_BOOL[] = { 'V','A','R','I','A','N','T','_','B','O','O','L',' ','\0' }; + const WCHAR wszVT_UI4[] = { 'u','n','s','i','g','n','e','d',' ','l','o','n','g',' ','\0' }; + const WCHAR wszVT_I4[] = { 'l','o','n','g',' ','\0' }; + const WCHAR wszVT_R4[] = { 's','i','n','g','l','e',' ','\0' }; + const WCHAR wszVT_INT[] = { 'i','n','t',' ','\0' }; + const WCHAR wszVT_BSTR[] = { 'B','S','T','R',' ','\0' }; + const WCHAR wszVT_CY[] = { 'C','U','R','R','E','N','C','Y',' ','\0' }; memset(&tvi, 0, sizeof(TVITEM)); tvi.hItem = TreeView_GetSelection(globals.hTree); U(tvis).item.mask = TVIF_TEXT|TVIF_CHILDREN; + U(tvis).item.cchTextMax = MAX_LOAD_STRING; + U(tvis).item.pszText = wszText; U(tvis).item.cChildren = 1; tvis.hInsertAfter = (HTREEITEM)TVI_LAST; tvis.hParent = TVI_ROOT; SendMessage(globals.hTree, TVM_GETITEM, 0, (LPARAM)&tvi); - if(FAILED(LoadTypeLib(((ITEM_INFO*)tvi.lParam)->path, &pTypeLib))) return; + if(FAILED((hRes = LoadTypeLib(((ITEM_INFO*)tvi.lParam)->path, &pTypeLib)))) + { + WCHAR wszMessage[MAX_LOAD_STRING]; + WCHAR wszError[MAX_LOAD_STRING]; + + LoadString(globals.hMainInst, IDS_ERROR_LOADTYPELIB, + wszError, sizeof(WCHAR[MAX_LOAD_STRING])); + wsprintfW(wszMessage, wszError, ((ITEM_INFO*)tvi.lParam)->path, hRes); + MessageBox(globals.hMainWnd, wszMessage, NULL, MB_OK|MB_ICONEXCLAMATION); + return 1; + } count = ITypeLib_GetTypeInfoCount(pTypeLib); - for(i=-1; i<count; i++) { - ITypeLib_GetDocumentation(pTypeLib, i, &bstrName, NULL, NULL, NULL); + ITypeLib_GetDocumentation(pTypeLib, -1, &bstrName, &bstrData, NULL, NULL); + wsprintfW(wszText, wszFormat, bstrName, bstrData); + SysFreeString(bstrName); + SysFreeString(bstrData); + tvis.hParent = (HTREEITEM)SendMessage(typelib.hTree, + TVM_INSERTITEM, 0, (LPARAM)&tvis); - U(tvis).item.cchTextMax = SysStringLen(bstrName); - U(tvis).item.pszText = bstrName; + for(i=0; i<count; i++) + { + ITypeLib_GetTypeInfo(pTypeLib, i, &pTypeInfo); - if(i==-1) - tvis.hParent = (HTREEITEM)SendMessage(typelib.hTree, - TVM_INSERTITEM, 0, (LPARAM)&tvis); - else SendMessage(typelib.hTree, TVM_INSERTITEM, 0, (LPARAM)&tvis); + ITypeInfo_GetDocumentation(pTypeInfo, MEMBERID_NIL, &bstrName, NULL, NULL, NULL); + ITypeInfo_GetTypeAttr(pTypeInfo, &pTypeAttr); + memset(wszText, 0, sizeof(wszText)); + 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_DISPATCH); + TKINDADDTOSTR(TKIND_COCLASS); + TKINDADDTOSTR(TKIND_UNION); + case TKIND_ALIAS: + AddToStrW(wszText, wszTKIND_ALIAS); + + switch(pTypeAttr->tdescAlias.vt&VT_TYPEMASK) + { +#define VTADDTOSTR(x) case x:\ + AddToStrW(wszText, wsz##x);\ + break + VTADDTOSTR(VT_BOOL); + VTADDTOSTR(VT_UI4); + VTADDTOSTR(VT_I4); + VTADDTOSTR(VT_R4); + VTADDTOSTR(VT_INT); + VTADDTOSTR(VT_BSTR); + VTADDTOSTR(VT_CY); + case VT_USERDEFINED: + ITypeInfo_GetRefTypeInfo(pTypeInfo, U(pTypeAttr->tdescAlias).hreftype, &pRefTypeInfo); + ITypeInfo_GetDocumentation(pRefTypeInfo, MEMBERID_NIL, &bstrData, NULL, NULL, NULL); + AddToStrW(wszText, bstrData); + AddToStrW(wszText, wszSpace); + SysFreeString(bstrData); + ITypeInfo_Release(pRefTypeInfo); + break; + } + + AddToStrW(wszText, bstrName); + break; + default: + lstrcpyW(wszText, bstrName); + } + SendMessage(typelib.hTree, TVM_INSERTITEM, 0, (LPARAM)&tvis); + + ITypeInfo_ReleaseTypeAttr(pTypeInfo, pTypeAttr); + ITypeInfo_Release(pTypeInfo); SysFreeString(bstrName); } SendMessage(typelib.hTree, TVM_EXPAND, TVE_EXPAND, (LPARAM)tvis.hParent); ITypeLib_Release(pTypeLib); + return 0; } void TypeLibResizeChild(void) @@ -124,8 +221,8 @@ LRESULT CALLBACK TypeLibProc(HWND hWnd, SetLeft(typelib.hPaneWnd, typelib.hTree); SetRight(typelib.hPaneWnd, typelib.hEdit); - PopulateTree(); - SetFocus(typelib.hTree); + if(PopulateTree()) DestroyWindow(hWnd); + else SetFocus(typelib.hTree); break; } case WM_COMMAND:

1 0

Thomas Kho : wcmd: Modify option parser to allow compound options.
by Alexandre Julliard July 3, 2006

July 3, 2006

Module: wine Branch: refs/heads/master Commit: 543716e1148bf67ca1e0130bf84cd77ff60ecd80 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=543716e1148bf67ca1e0130… Author: Thomas Kho <tkho(a)ucla.edu> Date: Fri Jun 30 21:02:31 2006 -0500 wcmd: Modify option parser to allow compound options. --- programs/wcmd/wcmdmain.c | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/programs/wcmd/wcmdmain.c b/programs/wcmd/wcmdmain.c index 8b61445..1af01eb 100644 --- a/programs/wcmd/wcmdmain.c +++ b/programs/wcmd/wcmdmain.c @@ -61,21 +61,30 @@ int main (int argc, char *argv[]) opt_c=opt_k=opt_q=0; while (*argv!=NULL) { - if (lstrcmpi(*argv,"/c")==0) { - opt_c=1; + char c; + if ((*argv)[0]!='/' || (*argv)[1]=='\0') { argv++; - break; - } else if (lstrcmpi(*argv,"/q")==0) { + continue; + } + + c=(*argv)[1]; + if (tolower(c)=='c') { + opt_c=1; + } else if (tolower(c)=='q') { opt_q=1; - } else if (lstrcmpi(*argv,"/k")==0) { + } else if (tolower(c)=='k') { opt_k=1; - argv++; - break; - } else if (lstrcmpi(*argv,"/t")==0 || lstrcmpi(*argv,"/x")==0 || - lstrcmpi(*argv,"/y")==0) { + } else if (tolower(c)=='t' || tolower(c)=='x' || tolower(c)=='y') { /* Ignored for compatibility with Windows */ } - argv++; + + if ((*argv)[2]==0) + argv++; + else /* handle `cmd /cnotepad.exe` and `cmd /x/c ...` */ + *argv+=2; + + if (opt_c || opt_k) /* break out of parsing immediately after c or k */ + break; } if (opt_q) {

1 0

Andrew Talbot : winmm/winealsa: Write-strings warning fix.
by Alexandre Julliard July 3, 2006

July 3, 2006

Module: wine Branch: refs/heads/master Commit: 343597b336551f924f1aa205fae0a40288884fa1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=343597b336551f924f1aa20… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sun Jul 2 14:45:06 2006 +0100 winmm/winealsa: Write-strings warning fix. --- dlls/winmm/winealsa/audio.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/winealsa/audio.c b/dlls/winmm/winealsa/audio.c index f61e1f2..9eec364 100644 --- a/dlls/winmm/winealsa/audio.c +++ b/dlls/winmm/winealsa/audio.c @@ -503,10 +503,9 @@ static int ALSA_TestDeviceForWine(int ca char pcmname[256]; int retcode; snd_pcm_hw_params_t *hwparams; - char *reason = NULL; + const char *reason = NULL; unsigned int rrate; - /* Note that the plug: device masks out a lot of info, we want to avoid that */ sprintf(pcmname, "hw:%d,%d", card, device); retcode = snd_pcm_open(&pcm, pcmname, streamtype, SND_PCM_NONBLOCK); @@ -527,7 +526,7 @@ static int ALSA_TestDeviceForWine(int ca goto exit; } - /* set the count of channels */ + /* set the count of channels */ retcode = snd_pcm_hw_params_set_channels(pcm, hwparams, 2); if (retcode < 0) { @@ -567,7 +566,6 @@ exit: TRACE("Discarding card %d/device %d: %s [%d(%s)]\n", card, device, reason, retcode, snd_strerror(retcode)); return retcode; - } /**************************************************************************

1 0

Andrew Talbot : taskmgr: Write-strings warnings fix.
by Alexandre Julliard July 3, 2006

July 3, 2006

Module: wine Branch: refs/heads/master Commit: 663187a3a7a22ff283064f7e1a0e564802d019bc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=663187a3a7a22ff283064f7… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jul 1 22:57:26 2006 +0100 taskmgr: Write-strings warnings fix. --- programs/taskmgr/dbgchnl.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/programs/taskmgr/dbgchnl.c b/programs/taskmgr/dbgchnl.c index 0d7b0ac..46741eb 100644 --- a/programs/taskmgr/dbgchnl.c +++ b/programs/taskmgr/dbgchnl.c @@ -223,34 +223,39 @@ static void DebugChannels_OnCreate(HWND { HWND hLV = GetDlgItem(hwndDlg, IDC_DEBUG_CHANNELS_LIST); LVCOLUMN lvc; + static TCHAR debug_channelT[] = {'D','e','b','u','g',' ','C','h','a','n','n','e','l',0}, + fixmeT[] = {'F','i','x','m','e',0}, + errT[] = {'E','r','r',0}, + warnT[] = {'W','a','r','n',0}, + traceT[] = {'T','r','a','c','e',0}; lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_LEFT; - lvc.pszText = _T("Debug Channel"); + lvc.pszText = debug_channelT; lvc.cx = 100; SendMessage(hLV, LVM_INSERTCOLUMN, 0, (LPARAM) &lvc); lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_CENTER; - lvc.pszText = _T("Fixme"); + lvc.pszText = fixmeT; lvc.cx = 55; SendMessage(hLV, LVM_INSERTCOLUMN, 1, (LPARAM) &lvc); lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_CENTER; - lvc.pszText = _T("Err"); + lvc.pszText = errT; lvc.cx = 55; SendMessage(hLV, LVM_INSERTCOLUMN, 2, (LPARAM) &lvc); lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_CENTER; - lvc.pszText = _T("Warn"); + lvc.pszText = warnT; lvc.cx = 55; SendMessage(hLV, LVM_INSERTCOLUMN, 3, (LPARAM) &lvc); lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_CENTER; - lvc.pszText = _T("Trace"); + lvc.pszText = traceT; lvc.cx = 55; SendMessage(hLV, LVM_INSERTCOLUMN, 4, (LPARAM) &lvc);

1 0