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

Piotr Caban : oleview: Added base menu funcionality.
by Alexandre Julliard June 21, 2006

June 21, 2006

Module: wine Branch: refs/heads/master Commit: 4cfa6a151aa43ae816f0427666eaf848bb58ac39 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4cfa6a151aa43ae816f0427… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jun 14 19:55:08 2006 +0200 oleview: Added base menu funcionality. --- programs/oleview/En.rc | 1 programs/oleview/main.h | 8 ++ programs/oleview/oleview.c | 177 +++++++++++++++++++++++++++++++++++++++++++ programs/oleview/resource.h | 1 programs/oleview/tree.c | 5 + 5 files changed, 192 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=4cfa6a151aa43ae816f…

1 0

Piotr Caban : oleview: Added TreeView window.
by Alexandre Julliard June 21, 2006

June 21, 2006

Module: wine Branch: refs/heads/master Commit: 3348ecdddcde87260d4a5ae28b78c900206ca553 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3348ecdddcde87260d4a5ae… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jun 14 19:52:26 2006 +0200 oleview: Added TreeView window. --- programs/oleview/En.rc | 10 ++ programs/oleview/Makefile.in | 3 - programs/oleview/main.h | 37 +++++++++ programs/oleview/oleview.c | 6 + programs/oleview/resource.h | 10 ++ programs/oleview/tree.c | 171 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 236 insertions(+), 1 deletions(-) create mode 100644 programs/oleview/tree.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=3348ecdddcde87260d4…

1 0

Piotr Caban : oleview: Added more TreeView entries.
by Alexandre Julliard June 21, 2006

June 21, 2006

Module: wine Branch: refs/heads/master Commit: 75469d712b7e33e6f4372f3ee3c35b861ea4f7e2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=75469d712b7e33e6f4372f3… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jun 14 19:53:47 2006 +0200 oleview: Added more TreeView entries. --- programs/oleview/En.rc | 4 + programs/oleview/main.h | 1 programs/oleview/oleview.c | 1 programs/oleview/resource.h | 4 + programs/oleview/tree.c | 156 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 166 insertions(+), 0 deletions(-) diff --git a/programs/oleview/En.rc b/programs/oleview/En.rc index 46cff2d..26019a9 100644 --- a/programs/oleview/En.rc +++ b/programs/oleview/En.rc @@ -76,6 +76,7 @@ STRINGTABLE IDS_APPNAME "OleView" IDS_APPTITLE "Wine OleView" IDS_READY "Ready" + IDS_ABOUT "OleView - OLE/COM Object Viewer" IDM_BIND, "Bind to file via a File Moniker" IDM_TYPELIB, "Open a TypeLib file and view the contents" @@ -107,4 +108,7 @@ STRINGTABLE IDS_TREE_TL, "Type Libraries" IDS_TL_VER, "ver." IDS_TREE_I, "Interfaces" + + IDS_CGCOFAIL, "CoGetClassObject failed." + IDS_ERROR_UNKN, "Unknown error" } diff --git a/programs/oleview/main.h b/programs/oleview/main.h index 664284b..9e3a8f7 100644 --- a/programs/oleview/main.h +++ b/programs/oleview/main.h @@ -48,6 +48,7 @@ typedef struct HWND hStatusBar; HWND hToolBar; HINSTANCE hMainInst; + DWORD dwClsCtx; }GLOBALS; typedef struct diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index 4997cf7..1a786e5 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -143,6 +143,7 @@ BOOL InitInstance(HINSTANCE hInst, int n globals.hMainWnd = hWnd; globals.hMainInst = hInst; + globals.dwClsCtx = CLSCTX_INPROC_SERVER|CLSCTX_LOCAL_SERVER; ShowWindow(hWnd, nCmdShow); UpdateWindow(hWnd); diff --git a/programs/oleview/resource.h b/programs/oleview/resource.h index 1725326..f7517c6 100644 --- a/programs/oleview/resource.h +++ b/programs/oleview/resource.h @@ -25,6 +25,7 @@ #define IDB_TOOLBAR 4 #define IDA_OLEVIEW 5 #define IDS_READY 10 +#define IDS_ABOUT 20 #define IDM_BIND 100 #define IDM_TYPELIB 101 @@ -58,3 +59,6 @@ #define IDS_TREE_AID 210 #define IDS_TREE_TL 220 #define IDS_TL_VER 221 #define IDS_TREE_I 230 + +#define IDS_CGCOFAIL 300 +#define IDS_ERROR_UNKN 301 diff --git a/programs/oleview/tree.c b/programs/oleview/tree.c index a173533..48664f9 100644 --- a/programs/oleview/tree.c +++ b/programs/oleview/tree.c @@ -50,6 +50,150 @@ LPARAM CreateITEM_INFO(INT flag, const W return (LPARAM)reg; } +void CreateInst(HTREEITEM item) +{ + TVITEM tvi; + HTREEITEM hCur; + TVINSERTSTRUCT tvis; + WCHAR wszTitle[MAX_LOAD_STRING]; + WCHAR wszMessage[MAX_LOAD_STRING]; + WCHAR wszFlagName[MAX_LOAD_STRING]; + WCHAR wszTreeName[MAX_LOAD_STRING]; + WCHAR wszRegPath[MAX_LOAD_STRING]; + const WCHAR wszFormat[] = { '\n','%','s',' ','(','$','%','x',')','\n','\0' }; + CLSID clsid; + IUnknown *obj, *unk; + HRESULT hRes; + + memset(&tvi, 0, sizeof(TVITEM)); + tvi.mask = TVIF_TEXT; + tvi.hItem = item; + tvi.cchTextMax = MAX_LOAD_STRING; + tvi.pszText = wszTreeName; + + memset(&tvis, 0, sizeof(TVINSERTSTRUCT)); + tvis.item.mask = TVIF_TEXT|TVIF_PARAM; + tvis.item.cchTextMax = MAX_LOAD_STRING; + tvis.hInsertAfter = (HTREEITEM)TVI_FIRST; + tvis.item.pszText = tvi.pszText; + tvis.hParent = item; + tvis.hInsertAfter = TVI_LAST; + + SendMessage(globals.hTree, TVM_GETITEM, 0, (LPARAM)&tvi); + + if(!tvi.lParam || ((ITEM_INFO *)tvi.lParam)->loaded + || !(((ITEM_INFO *)tvi.lParam)->cFlag&SHOWALL)) return; + + if(FAILED(CLSIDFromString(((ITEM_INFO *)tvi.lParam)->clsid, &clsid))) return; + + hRes = CoCreateInstance(&clsid, NULL, globals.dwClsCtx, + &IID_IUnknown, (void **)&obj); + + if(FAILED(hRes)) + { + LoadString(globals.hMainInst, IDS_CGCOFAIL, wszMessage, + sizeof(WCHAR[MAX_LOAD_STRING])); + LoadString(globals.hMainInst, IDS_ABOUT, wszTitle, + sizeof(WCHAR[MAX_LOAD_STRING])); + +#define CASE_ERR(i) case i: \ + MultiByteToWideChar(CP_ACP, 0, #i, -1, wszFlagName, MAX_LOAD_STRING); \ + break + + switch(hRes) + { + CASE_ERR(REGDB_E_CLASSNOTREG); + CASE_ERR(E_NOINTERFACE); + CASE_ERR(REGDB_E_READREGDB); + CASE_ERR(REGDB_E_KEYMISSING); + CASE_ERR(CO_E_DLLNOTFOUND); + CASE_ERR(CO_E_APPNOTFOUND); + CASE_ERR(E_ACCESSDENIED); + CASE_ERR(CO_E_ERRORINDLL); + CASE_ERR(CO_E_APPDIDNTREG); + CASE_ERR(CLASS_E_CLASSNOTAVAILABLE); + default: + LoadString(globals.hMainInst, IDS_ERROR_UNKN, wszFlagName, MAX_LOAD_STRING); + } + + wsprintfW(&wszMessage[strlenW(wszMessage)], wszFormat, + wszFlagName, (unsigned)hRes); + MessageBox(globals.hMainWnd, wszMessage, wszTitle, MB_OK|MB_ICONEXCLAMATION); + return; + } + + ((ITEM_INFO *)tvi.lParam)->loaded = 1; + ((ITEM_INFO *)tvi.lParam)->pU = obj; + + tvi.mask = TVIF_STATE; + tvi.state = TVIS_BOLD; + tvi.stateMask = TVIS_BOLD; + SendMessage(globals.hTree, TVM_SETITEM, 0, (LPARAM)&tvi); + + tvi.mask = TVIF_TEXT; + hCur = TreeView_GetChild(globals.hTree, tree.hI); + + while(hCur) + { + tvi.hItem = hCur; + SendMessage(globals.hTree, TVM_GETITEM, 0, (LPARAM)&tvi); + + if(!tvi.lParam) + { + hCur = TreeView_GetNextSibling(globals.hTree, hCur); + continue; + } + + CLSIDFromString(((ITEM_INFO *)tvi.lParam)->clsid, &clsid); + hRes = IUnknown_QueryInterface(obj, &clsid, (void *)&unk); + + if(SUCCEEDED(hRes)) + { + IUnknown_Release(unk); + + strcpyW(wszRegPath, wszInterface); + strcpyW(&wszRegPath[strlenW(wszRegPath)], ((ITEM_INFO *)tvi.lParam)->clsid); + tvis.item.lParam = CreateITEM_INFO(REGTOP|INTERFACE|REGPATH, + wszRegPath, ((ITEM_INFO *)tvi.lParam)->clsid); + SendMessage(globals.hTree, TVM_INSERTITEM, 0, (LPARAM)&tvis); + } + hCur = TreeView_GetNextSibling(globals.hTree, hCur); + } +} + +void ReleaseInst(HTREEITEM item) +{ + TVITEM tvi; + HTREEITEM cur; + IUnknown *pU; + + memset(&tvi, 0, sizeof(TVITEM)); + tvi.hItem = item; + SendMessage(globals.hTree, TVM_GETITEM, 0, (LPARAM)&tvi); + + if(!tvi.lParam) return; + + pU = ((ITEM_INFO *)tvi.lParam)->pU; + + if(pU) IUnknown_Release(pU); + ((ITEM_INFO *)tvi.lParam)->loaded = 0; + + SendMessage(globals.hTree, TVM_EXPAND, TVE_COLLAPSE, (LPARAM)item); + + cur = TreeView_GetChild(globals.hTree, item); + while(cur) + { + SendMessage(globals.hTree, TVM_DELETEITEM, 0, (LPARAM)cur); + cur = TreeView_GetChild(globals.hTree, item); + } + + tvi.mask = TVIF_CHILDREN|TVIF_STATE; + tvi.state = 0; + tvi.stateMask = TVIS_BOLD; + tvi.cChildren = 1; + SendMessage(globals.hTree, TVM_SETITEM, 0, (LPARAM)&tvi); +} + BOOL CreateRegPath(HTREEITEM item, WCHAR *buffer, int bufSize) { TVITEM tvi; @@ -446,7 +590,10 @@ void EmptyTree(void) SendMessage(globals.hTree, TVM_GETITEM, 0, (LPARAM)&tvi); if(tvi.lParam) + { + if(((ITEM_INFO *)tvi.lParam)->loaded) ReleaseInst(del); HeapFree(GetProcessHeap(), 0, (ITEM_INFO *)tvi.lParam); + } SendMessage(globals.hTree, TVM_DELETEITEM, 0, (LPARAM)del); @@ -482,6 +629,15 @@ LRESULT CALLBACK TreeProc(HWND hWnd, UIN 0, 0, 0, 0, hWnd, (HMENU)TREE_WINDOW, globals.hMainInst, NULL); AddTreeEx(); break; + case WM_NOTIFY: + if((int)wParam != TREE_WINDOW) break; + switch(((LPNMHDR)lParam)->code) + { + case TVN_ITEMEXPANDING: + CreateInst(((NMTREEVIEW *)lParam)->itemNew.hItem); + break; + } + break; case WM_SIZE: MoveWindow(globals.hTree, 0, 0, LOWORD(lParam), HIWORD(lParam), TRUE); break;

1 0

Piotr Caban : oleview: Added TreeView entries read from registry.
by Alexandre Julliard June 21, 2006

June 21, 2006

Module: wine Branch: refs/heads/master Commit: 6c7a65c1d32b309b4575cc966184e190ecf2cd0a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6c7a65c1d32b309b4575cc9… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jun 14 20:09:12 2006 +0200 oleview: Added TreeView entries read from registry. --- programs/oleview/tree.c | 336 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 336 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=6c7a65c1d32b309b457…

1 0

Piotr Caban : oleview: Added initial version.
by Alexandre Julliard June 21, 2006

June 21, 2006

Module: wine Branch: refs/heads/master Commit: 68f590cf82d5719a7552d5c732db44eecb9524eb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=68f590cf82d5719a7552d5c… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jun 14 19:50:28 2006 +0200 oleview: Added initial version. --- configure | 3 configure.ac | 1 programs/Makefile.in | 2 programs/oleview/.gitignore | 3 programs/oleview/En.rc | 100 +++++++++++++ programs/oleview/Makefile.in | 20 +++ programs/oleview/main.h | 43 ++++++ programs/oleview/oleview | 1 programs/oleview/oleview.c | 167 ++++++++++++++++++++++ programs/oleview/resource.h | 50 ++++++ programs/oleview/rsrc.rc | 326 ++++++++++++++++++++++++++++++++++++++++++ 11 files changed, 715 insertions(+), 1 deletions(-) create mode 100644 programs/oleview/.gitignore create mode 100644 programs/oleview/En.rc create mode 100644 programs/oleview/Makefile.in create mode 100644 programs/oleview/main.h create mode 120000 programs/oleview/oleview create mode 100644 programs/oleview/oleview.c create mode 100644 programs/oleview/resource.h create mode 100644 programs/oleview/rsrc.rc Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=68f590cf82d5719a755…

1 0

Piotr Caban : oleview: Added pane bar.
by Alexandre Julliard June 21, 2006

June 21, 2006

Module: wine Branch: refs/heads/master Commit: b33f95e65259b3d8a0ef01ca2660c91deabc0540 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b33f95e65259b3d8a0ef01c… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jun 14 19:51:27 2006 +0200 oleview: Added pane bar. --- programs/oleview/Makefile.in | 3 + programs/oleview/main.h | 17 ++++ programs/oleview/oleview.c | 8 ++ programs/oleview/pane.c | 159 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 185 insertions(+), 2 deletions(-) create mode 100644 programs/oleview/pane.c diff --git a/programs/oleview/Makefile.in b/programs/oleview/Makefile.in index 8c2fb93..f976743 100644 --- a/programs/oleview/Makefile.in +++ b/programs/oleview/Makefile.in @@ -9,7 +9,8 @@ EXTRALIBS = -luuid EXTRADEFS = -DUNICODE C_SRCS = \ - oleview.c + oleview.c \ + pane.c RC_SRCS = rsrc.rc RC_BINSRC = rsrc.rc diff --git a/programs/oleview/main.h b/programs/oleview/main.h index 0c6fc09..870d436 100644 --- a/programs/oleview/main.h +++ b/programs/oleview/main.h @@ -29,15 +29,32 @@ #include <wine/unicode.h> #include "resource.h" #define MAX_LOAD_STRING 256 +#define MAX_WINDOW_WIDTH 30000 #define STATUS_WINDOW 2000 typedef struct { HWND hMainWnd; + HWND hPaneWnd; HWND hStatusBar; HWND hToolBar; HINSTANCE hMainInst; }GLOBALS; +typedef struct +{ + HWND left; + HWND right; + INT pos; + INT size; + INT width; + INT height; + INT last; +}PANE; + extern GLOBALS globals; + +/* Predefinitions: */ +/* pane.c */ +BOOL CreatePanedWindow(HWND hWnd, HWND *hWndCreated, HINSTANCE hInst); diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index 76fe1c9..c248055 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -24,7 +24,7 @@ GLOBALS globals; void ResizeChild(void) { - RECT stat, tool; + RECT client, stat, tool; MoveWindow(globals.hStatusBar, 0, 0, 0, 0, TRUE); MoveWindow(globals.hToolBar, 0, 0, 0, 0, TRUE); @@ -39,6 +39,10 @@ void ResizeChild(void) tool.bottom += 2; } else tool.bottom = 0; + + GetClientRect(globals.hMainWnd, &client); + MoveWindow(globals.hPaneWnd, 0, tool.bottom, + client.right, client.bottom-tool.bottom-stat.bottom, TRUE); } void UpdateStatusBar(int itemID) @@ -58,6 +62,8 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT { case WM_CREATE: OleInitialize(NULL); + if(!CreatePanedWindow(hWnd, &globals.hPaneWnd, globals.hMainInst)) + PostQuitMessage(0); break; case WM_DESTROY: OleUninitialize(); diff --git a/programs/oleview/pane.c b/programs/oleview/pane.c new file mode 100644 index 0000000..6e5ab62 --- /dev/null +++ b/programs/oleview/pane.c @@ -0,0 +1,159 @@ +/* + * OleView (pane.c) + * + * Copyright 2006 Piotr Caban + * + * 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 + */ + +#include "main.h" + +int GetSplitPos(HWND hWnd) +{ + PANE *pane = (PANE *)GetMenu(hWnd); + + if(pane->pos < pane->size/2+1) pane->pos = pane->size/2+1; + + return (pane->width>pane->pos+pane->size/2+1 ? + pane->pos : pane->width-pane->size/2-1); +} + +void DrawSplitMoving(HWND hWnd, int x) +{ + RECT rt; + HDC hdc = GetDC(hWnd); + PANE *pane = (PANE *)GetMenu(hWnd); + + GetClientRect(hWnd, &rt); + + if(pane->last!=-1) + { + rt.left = pane->last-pane->size/2; + rt.right = pane->last+pane->size/2; + InvertRect(hdc, &rt); + } + + pane->pos = x>MAX_WINDOW_WIDTH ? -1 : x; + x = GetSplitPos(hWnd); + + pane->pos = x; + rt.left = x-pane->size/2; + rt.right = x+pane->size/2; + pane->last = x; + InvertRect(hdc, &rt); + + ReleaseDC(hWnd, hdc); +} + +LRESULT CALLBACK PaneProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + POINT pt; + PANE *pane = (PANE*)GetMenu(hWnd); + + switch(uMsg) + { + case WM_SETCURSOR: + GetCursorPos(&pt); + ScreenToClient(hWnd, &pt); + + if(pt.x >= GetSplitPos(hWnd)-pane->size/2 && + pt.x <= GetSplitPos(hWnd)+pane->size/2) + SetCursor(LoadCursor(0, IDC_SIZEWE)); + break; + case WM_LBUTTONDOWN: + if(LOWORD(lParam) >= GetSplitPos(hWnd)-pane->size/2 && + LOWORD(lParam) <= GetSplitPos(hWnd)+pane->size/2) + { + pane->last = -1; + DrawSplitMoving(hWnd, LOWORD(lParam)); + SetCapture(hWnd); + } + break; + case WM_LBUTTONUP: + if(GetCapture() == hWnd) + { + pane->last = -1; + DrawSplitMoving(hWnd, LOWORD(lParam)); + + MoveWindow(pane->left, 0, 0, + GetSplitPos(hWnd)-pane->size/2, pane->height, TRUE); + MoveWindow(pane->right, GetSplitPos(hWnd)+pane->size/2, 0, + pane->width-GetSplitPos(hWnd)-pane->size/2, pane->height, TRUE); + + ReleaseCapture(); + } + break; + case WM_MOUSEMOVE: + if(GetCapture() == hWnd) + DrawSplitMoving(hWnd, LOWORD(lParam)); + break; + case WM_SIZE: + if(wParam == SIZE_MINIMIZED) break; + pane->width = LOWORD(lParam); + pane->height = HIWORD(lParam); + + MoveWindow(pane->left, 0, 0, + GetSplitPos(hWnd)-pane->size/2, HIWORD(lParam), TRUE); + MoveWindow(pane->right, GetSplitPos(hWnd)+pane->size/2, 0, + LOWORD(lParam)-GetSplitPos(hWnd)-pane->size/2, + HIWORD(lParam), TRUE); + break; + case WM_DESTROY: + HeapFree(GetProcessHeap(), 0, pane); + break; + default: + return DefWindowProc(hWnd, uMsg, wParam, lParam); + } + return 0; +} + +BOOL CreatePanedWindow(HWND hWnd, HWND *hWndCreated, HINSTANCE hInst) +{ + WNDCLASS wcc; + const WCHAR wszPaneClass[] = { 'P','A','N','E','\0' }; + PANE *pane; + + memset(&wcc, 0, sizeof(WNDCLASS)); + wcc.lpfnWndProc = PaneProc; + wcc.hbrBackground = (HBRUSH)(COLOR_WINDOW); + wcc.lpszClassName = wszPaneClass; + + if(!RegisterClass(&wcc)) + return FALSE; + + pane = HeapAlloc(GetProcessHeap(), 0, sizeof(PANE)); + *hWndCreated = CreateWindow(wszPaneClass, NULL, WS_CHILD|WS_VISIBLE, + CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, hWnd, (HMENU)pane, hInst, NULL); + if(!hWndCreated) return FALSE; + + pane->left = NULL; + pane->right = NULL; + pane->pos = 300; + pane->size = 5; + + return TRUE; +} + +void SetLeft(HWND hParent, HWND hWnd) +{ + PANE *pane = (PANE *)GetMenu(hParent); + pane->left = hWnd; +} + +void SetRight(HWND hParent, HWND hWnd) +{ + PANE *pane = (PANE *)GetMenu(hParent); + pane->right = hWnd; +}

1 0

Louis. Lenders : wined3d: Add an "\n" to a fixme to fix an overflow.
by Alexandre Julliard June 21, 2006

June 21, 2006

Module: wine Branch: refs/heads/master Commit: 6601e8eefe2bc79af2e98917c8786fc9fd1c7982 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6601e8eefe2bc79af2e9891… Author: Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Jun 21 06:07:01 2006 +0100 wined3d: Add an "\n" to a fixme to fix an overflow. --- dlls/wined3d/surface_gdi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index ce39090..5691b4d 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -1042,7 +1042,7 @@ #undef COPY_COLORKEY_FX error: if (Flags && FIXME_ON(d3d_surface)) { - FIXME("\tUnsupported flags: %08lx", Flags); + FIXME("\tUnsupported flags: %08lx\n", Flags); } release:

1 0

Jason Green : wined3d: Bind correct number of samplers for GLSL shaders.
by Alexandre Julliard June 21, 2006

June 21, 2006

Module: wine Branch: refs/heads/master Commit: e0ccbeb282b8250f4555ba3ca3dba31e77047b2a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e0ccbeb282b8250f4555ba3… Author: Jason Green <jave27(a)gmail.com> Date: Tue Jun 20 18:32:52 2006 -0400 wined3d: Bind correct number of samplers for GLSL shaders. We are only checking against GL_MAX_TEXTURES when binding samplers, when we should be checking against the maximum number of samplers that the card supports. Spotted by H. Verbeet. --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c85b0c9..f3c9cca 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -60,7 +60,7 @@ void shader_glsl_load_psamplers( int i; char sampler_name[20]; - for (i=0; i< GL_LIMITS(textures); ++i) { + for (i=0; i< GL_LIMITS(samplers); ++i) { if (stateBlock->textures[i] != NULL) { snprintf(sampler_name, sizeof(sampler_name), "Psampler%d", i); name_loc = GL_EXTCALL(glGetUniformLocationARB(programId, sampler_name));

1 0

Juan Lang : crypt32: Implement some CRL verification functions.
by Alexandre Julliard June 21, 2006

June 21, 2006

Module: wine Branch: refs/heads/master Commit: e8992af0fa8c3f799514b4c578a10138e68c8755 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e8992af0fa8c3f799514b4c… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Jun 20 16:06:27 2006 -0700 crypt32: Implement some CRL verification functions. --- dlls/crypt32/crl.c | 46 +++++++++ dlls/crypt32/crypt32.spec | 4 + dlls/crypt32/tests/crl.c | 229 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 278 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=e8992af0fa8c3f79951…

1 0

Juan Lang : wincrypt.h: Add more definitions and prototypes.
by Alexandre Julliard June 21, 2006

June 21, 2006

Module: wine Branch: refs/heads/master Commit: aeb8036486e382b0754c0ee311c6e129fc44843b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aeb8036486e382b0754c0ee… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Jun 20 14:42:51 2006 -0700 wincrypt.h: Add more definitions and prototypes. --- dlls/crypt32/main.c | 2 - include/wincrypt.h | 156 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 157 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 6bc44a3..f3e8a38 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -294,7 +294,7 @@ BOOL WINAPI CryptQueryObject(DWORD dwObj return FALSE; } -BOOL WINAPI CryptVerifyMessageSignature(/*PCRYPT_VERIFY_MESSAGE_PARA*/ void* pVerifyPara, +BOOL WINAPI CryptVerifyMessageSignature(PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, DWORD dwSignerIndex, const BYTE* pbSignedBlob, DWORD cbSignedBlob, BYTE* pbDecoded, DWORD* pcbDecoded, PCCERT_CONTEXT* ppSignerCert) { diff --git a/include/wincrypt.h b/include/wincrypt.h index 85dc780..66b0e57 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -916,6 +916,89 @@ typedef const CRYPT_OID_INFO CCRYPT_OID_ typedef BOOL (WINAPI *PFN_CRYPT_ENUM_OID_INFO)(PCCRYPT_OID_INFO pInfo, void *pvArg); +typedef struct _CRYPT_SIGN_MESSAGE_PARA { + DWORD cbSize; + DWORD dwMsgEncodingType; + PCCERT_CONTEXT pSigningCert; + CRYPT_ALGORITHM_IDENTIFIER HashAlgorithm; + void * pvHashAuxInfo; + DWORD cMsgCert; + PCCERT_CONTEXT *rgpMsgCert; + DWORD cMsgCrl; + PCCRL_CONTEXT *rgpMsgCrl; + DWORD cAuthAttr; + PCRYPT_ATTRIBUTE rgAuthAttr; + DWORD cUnauthAttr; + PCRYPT_ATTRIBUTE rgUnauthAttr; + DWORD dwFlags; + DWORD dwInnerContentType; +#ifdef CRYPT_SIGN_MESSAGE_PARA_HAS_CMS_FIELDS + CRYPT_ALGORITHM_IDENTIFIER HashEncryptionAlgorithm; + void * pvHashEncryptionAuxInfo; +#endif +} CRYPT_SIGN_MESSAGE_PARA, *PCRYPT_SIGN_MESSAGE_PARA; + +#define CRYPT_MESSAGE_BARE_CONTENT_OUT_FLAG 0x00000001 +#define CRYPT_MESSAGE_ENCAPSULATED_CONTENT_OUT_FLAG 0x00000002 +#define CRYPT_MESSAGE_KEYID_SIGNER_FLAG 0x00000004 +#define CRYPT_MESSAGE_SILENT_KEYSET_FLAG 0x00000008 + +typedef PCCERT_CONTEXT (WINAPI *PFN_CRYPT_GET_SIGNER_CERTIFICATE)(void *pvArg, + DWORD dwCertEncodingType, PCERT_INFO pSignerId, HCERTSTORE hMsgCertStore); + +typedef struct _CRYPT_VERIFY_MESSAGE_PARA { + DWORD cbSize; + DWORD dwMsgAndCertEncodingType; + HCRYPTPROV hCryptProv; + PFN_CRYPT_GET_SIGNER_CERTIFICATE pfnGetSignerCertificate; + void * pvGetArg; +} CRYPT_VERIFY_MESSAGE_PARA, *PCRYPT_VERIFY_MESSAGE_PARA; + +typedef struct _CRYPT_ENCRYPT_MESSAGE_PARA { + DWORD cbSize; + DWORD dwMsgEncodingType; + HCRYPTPROV hCryptProv; + CRYPT_ALGORITHM_IDENTIFIER ContentEncryptionAlgorithm; + void * pvEncryptionAuxInfo; + DWORD dwFlags; + DWORD dwInnerContentType; +} CRYPT_ENCRYPT_MESSAGE_PARA, *PCRYPT_ENCRYPT_MESSAGE_PARA; + +#define CRYPT_MESSAGE_KEYID_RECIPIENT_FLAG 0x00000004 + +typedef struct _CRYPT_DECRYPT_MESSAGE_PARA { + DWORD cbSize; + DWORD dwMsgAndCertEncodingType; + DWORD cCertStore; + HCERTSTORE *rghCertStore; +#ifdef CRYPT_DECRYPT_MESSAGE_PARA_HAS_EXTRA_FIELDS + DWORD dwFlags; +#endif +} CRYPT_DECRYPT_MESSAGE_PARA, *PCRYPT_DECRYPT_MESSAGE_PARA; + +typedef struct _CRYPT_HASH_MESSAGE_PARA { + DWORD cbSize; + DWORD dwMsgEncodingType; + HCRYPTPROV hCryptProv; + CRYPT_ALGORITHM_IDENTIFIER HashAlgorithm; + void * pvHashAuxInfo; +} CRYPT_HASH_MESSAGE_PARA, *PCRYPT_HASH_MESSAGE_PARA; + +typedef struct _CRYPT_KEY_SIGN_MESSAGE_PARA { + DWORD cbSize; + DWORD dwMsgAndCertEncodingType; + HCRYPTPROV hCryptProv; + DWORD dwKeySpec; + CRYPT_ALGORITHM_IDENTIFIER HashAlgorithm; + void * pvHashAuxInfo; +} CRYPT_KEY_SIGN_MESSAGE_PARA, *PCRYPT_KEY_SIGN_MESSAGE_PARA; + +typedef struct _CRYPT_KEY_VERIFY_MESSAGE_PARA { + DWORD cbSize; + DWORD dwMsgEncodingType; + HCRYPTPROV hCryptProv; +} CRYPT_KEY_VERIFY_MESSAGE_PARA, *PCRYPT_KEY_VERIFY_MESSAGE_PARA; + typedef struct _CRYPT_URL_ARRAY { DWORD cUrl; LPWSTR *rgwszUrl; @@ -2869,6 +2952,14 @@ PCERT_EXTENSION WINAPI CertFindExtension CERT_EXTENSION rgExtensions[]); PCERT_RDN_ATTR WINAPI CertFindRDNAttr(LPCSTR pszObjId, PCERT_NAME_INFO pName); +BOOL WINAPI CertIsValidCRLForCertificate(PCCERT_CONTEXT pCert, + PCCRL_CONTEXT pCrl, DWORD dwFlags, void *pvReserved); +BOOL WINAPI CertFindCertificateInCRL(PCCERT_CONTEXT pCert, + PCCRL_CONTEXT pCrlContext, DWORD dwFlags, void *pvReserved, + PCRL_ENTRY *ppCrlEntry); +BOOL WINAPI CertVerifyCRLRevocation(DWORD dwCertEncodingType, + PCERT_INFO pCertId, DWORD cCrlInfo, PCRL_INFO rgpCrlInfo[]); + BOOL WINAPI CertVerifySubjectCertificateContext(PCCERT_CONTEXT pSubject, PCCERT_CONTEXT pIssuer, DWORD *pdwFlags); @@ -2922,6 +3013,71 @@ BOOL WINAPI CertStrToNameW(DWORD dwCertE LPCWSTR *ppszError); #define CertStrToName WINELIB_NAME_AW(CertStrToName) +BOOL WINAPI CryptSignMessage(PCRYPT_SIGN_MESSAGE_PARA pSignPara, + BOOL fDetachedSignature, DWORD cToBeSigned, const BYTE *rgpbToBeSigned[], + DWORD rgcbToBeSigned[], BYTE *pbSignedBlob, DWORD *pcbSignedBlob); +BOOL WINAPI CryptSignMessageWithKey(PCRYPT_KEY_SIGN_MESSAGE_PARA pSignPara, + const BYTE *pbToBeSigned, DWORD cbToBeSigned, BYTE *pbSignedBlob, + DWORD *pcbSignedBlob); + +BOOL WINAPI CryptVerifyMessageSignature(PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, + DWORD dwSignerIndex, const BYTE* pbSignedBlob, DWORD cbSignedBlob, + BYTE* pbDecoded, DWORD* pcbDecoded, PCCERT_CONTEXT* ppSignerCert); +BOOL WINAPI CryptVerifyMessageSignatureWithKey( + PCRYPT_KEY_VERIFY_MESSAGE_PARA pVerifyPara, + PCERT_PUBLIC_KEY_INFO pPublicKeyInfo, const BYTE *pbSignedBlob, + DWORD cbSignedBlob, BYTE *pbDecoded, DWORD *pcbDecoded); + +BOOL WINAPI CryptVerifyDetachedMessageSignature( + PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, DWORD dwSignerIndex, + const BYTE *pbDetachedSignBlob, DWORD cbDetachedSignBlob, DWORD cToBeSigned, + const BYTE *rgpbToBeSigned[], DWORD rgcbToBeSigned[], + PCCERT_CONTEXT *ppSignerCert); +LONG WINAPI CryptGetMessageSignerCount(DWORD dwMsgEncodingType, + const BYTE *pbSignedBlob, DWORD cbSignedBlob); + +BOOL WINAPI CryptEncryptMessage(PCRYPT_ENCRYPT_MESSAGE_PARA pEncryptPara, + DWORD cRecipientCert, PCCERT_CONTEXT rgpRecipientCert[], + const BYTE *pbToBeEncrypted, DWORD cbToBeEncrypted, BYTE *pbEncryptedBlob, + DWORD *pcbEncryptedBlob); +BOOL WINAPI CryptDecryptMessage(PCRYPT_DECRYPT_MESSAGE_PARA pDecryptPara, + const BYTE *pbEncryptedBlob, DWORD cbEncryptedBlob, BYTE *pbDecrypted, + DWORD *pcbDecrypted, PCCERT_CONTEXT *ppXchgCert); + +BOOL WINAPI CryptSignAndEncryptMessage(PCRYPT_SIGN_MESSAGE_PARA pSignPara, + PCRYPT_ENCRYPT_MESSAGE_PARA pEncryptPara, DWORD cRecipientCert, + PCCERT_CONTEXT rgpRecipientCert[], const BYTE *pbToBeSignedAndEncrypted, + DWORD cbToBeSignedAndEncrypted, BYTE *pbSignedAndEncryptedBlob, + DWORD *pcbSignedAndEncryptedBlob); +BOOL WINAPI CryptDecryptAndVerifyMessageSignature( + PCRYPT_DECRYPT_MESSAGE_PARA pDecryptPara, + PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, DWORD dwSignerIndex, + const BYTE *pbEncryptedBlob, DWORD cbEncryptedBlob, BYTE *pbDecrypted, + DWORD *pcbDecrypted, PCCERT_CONTEXT *ppXchgCert, PCCERT_CONTEXT *ppSignerCert); + +HCERTSTORE WINAPI CryptGetMessageCertificates(DWORD dwMsgAndCertEncodingType, + HCRYPTPROV hCryptProv, DWORD dwFlags, const BYTE *pbSignedBlob, + DWORD cbSignedBlob); + +BOOL WINAPI CryptDecodeMessage(DWORD dwMsgTypeFlags, + PCRYPT_DECRYPT_MESSAGE_PARA pDecryptPara, + PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, DWORD dwSignerIndex, + const BYTE *pbEncodedBlob, DWORD cbEncodedBlob, DWORD dwPrevInnerContentType, + DWORD *pdwMsgType, DWORD *pdwInnerContentType, BYTE *pbDecoded, + DWORD *pcbDecoded, PCCERT_CONTEXT *ppXchgCert, PCCERT_CONTEXT *ppSignerCert); + +BOOL WINAPI CryptHashMessage(PCRYPT_HASH_MESSAGE_PARA pHashPara, + BOOL fDetachedHash, DWORD cToBeHashed, const BYTE *rgpbToBeHashed[], + DWORD rgcbToBeHashed[], BYTE *pbHashedBlob, DWORD *pcbHashedBlob, + BYTE *pbComputedHash, DWORD *pcbComputedHash); +BOOL WINAPI CryptVerifyMessageHash(PCRYPT_HASH_MESSAGE_PARA pHashPara, + BYTE *pbHashedBlob, DWORD cbHashedBlob, BYTE *pbToBeHashed, + DWORD *pcbToBeHashed, BYTE *pbComputedHash, DWORD *pcbComputedHash); +BOOL WINAPI CryptVerifyDetachedMessageHash(PCRYPT_HASH_MESSAGE_PARA pHashPara, + BYTE *pbDetachedHashBlob, DWORD cbDetachedHashBlob, DWORD cToBeHashed, + const BYTE *rgpbToBeHashed[], DWORD rgcbToBeHashed[], BYTE *pbComputedHash, + DWORD *pcbComputedHash); + /* cryptnet.dll functions */ BOOL WINAPI CryptGetObjectUrl(LPCSTR pszUrlOid, LPVOID pvPara, DWORD dwFlags, PCRYPT_URL_ARRAY pUrlArray, DWORD *pcbUrlArray, PCRYPT_URL_INFO pUrlInfo,

1 0