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

Mike McCormack : regedit: Fix some gcc 4. 1 warnings caused by casts in macros.
by Alexandre Julliard 03 Mar '06

03 Mar '06

Module: wine Branch: refs/heads/master Commit: d8bc6879be40cbce91f5aa3ffd729a7308bbf6fa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d8bc6879be40cbce91f5aa3… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 3 12:28:43 2006 +0900 regedit: Fix some gcc 4.1 warnings caused by casts in macros. --- programs/regedit/childwnd.c | 2 +- programs/regedit/framewnd.c | 6 +++--- programs/regedit/listview.c | 15 +++++++-------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index f6f0042..bc312ba 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -320,7 +320,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, item.mask = TVIF_HANDLE | TVIF_TEXT; item.hItem = TreeView_GetSelection(pChildWnd->hTreeWnd); item.pszText = dispInfo->item.pszText; - TreeView_SetItem(pChildWnd->hTreeWnd, &item); + SendMessage( pChildWnd->hTreeWnd, TVM_SETITEMW, 0, (LPARAM)&item ); } return res; } diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 241286c..fbe9646 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -640,8 +640,8 @@ static BOOL _CmdWndProc(HWND hWnd, UINT DWORD ksize = KEY_MAX_LEN, vsize = sizeof(valuebuf), type = 0; if (RegEnumValue(hKey, LOWORD(wParam) - ID_FAVORITE_FIRST, namebuf, &ksize, NULL, &type, valuebuf, &vsize) == ERROR_SUCCESS) { - TreeView_SelectItem(g_pChildWnd->hTreeWnd, - FindPathInTree(g_pChildWnd->hTreeWnd, (TCHAR *)valuebuf)); + SendMessage( g_pChildWnd->hTreeWnd, TVM_SELECTITEM, TVGN_CARET, + (LPARAM) FindPathInTree(g_pChildWnd->hTreeWnd, (TCHAR *)valuebuf) ); } RegCloseKey(hKey); } @@ -693,7 +693,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT hItem = FindNext(g_pChildWnd->hTreeWnd, hItem, searchString, searchMask, &row); SetCursor(hcursorOld); if (hItem) { - TreeView_SelectItem(g_pChildWnd->hTreeWnd, hItem); + SendMessage( g_pChildWnd->hTreeWnd, TVM_SELECTITEM, TVGN_CARET, (LPARAM) hItem ); InvalidateRect(g_pChildWnd->hTreeWnd, NULL, TRUE); UpdateWindow(g_pChildWnd->hTreeWnd); if (row != -1) { diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 5cc8002..2e06508 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -19,7 +19,6 @@ */ #include <windows.h> -#include <windowsx.h> #include <commctrl.h> #include <stdlib.h> #include <tchar.h> @@ -218,7 +217,7 @@ static BOOL InitListViewImageList(HWND h IMAGE_ICON, cx, cy, LR_DEFAULTCOLOR); Image_Binary = ImageList_AddIcon(himl, hicon); - ListView_SetImageList(hWndListView, himl, LVSIL_SMALL); + SendMessage( hWndListView, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM) himl ); /* fail if some of the icons failed to load */ if (ImageList_GetImageCount(himl) < 2) @@ -373,7 +372,7 @@ static LRESULT CALLBACK ListWndProc(HWND g_invertSort = FALSE; } - ListView_SortItems(hWnd, CompareFunc, hWnd); + SendMessage(hWnd, LVM_SORTITEMS, (WPARAM)hWnd, (LPARAM)CompareFunc); break; case LVN_ENDLABELEDIT: { LPNMLVDISPINFO dispInfo = (LPNMLVDISPINFO)lParam; @@ -453,12 +452,12 @@ HWND CreateListView(HWND hwndParent, int 0, 0, rcClient.right, rcClient.bottom, hwndParent, (HMENU)id, hInst, NULL); if (!hwndLV) return NULL; - ListView_SetExtendedListViewStyle(hwndLV, LVS_EX_FULLROWSELECT); + SendMessage(hwndLV, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT); /* Initialize the image list */ if (!InitListViewImageList(hwndLV)) goto fail; if (!CreateListColumns(hwndLV)) goto fail; - g_orgListWndProc = SubclassWindow(hwndLV, ListWndProc); + g_orgListWndProc = (WNDPROC) SetWindowLongPtr(hwndLV, GWLP_WNDPROC, (LPARAM)ListWndProc); return hwndLV; fail: DestroyWindow(hwndLV); @@ -490,12 +489,12 @@ BOOL RefreshListView(HWND hwndLV, HKEY h for (i = 0; i < count; i++) { item.mask = LVIF_PARAM; item.iItem = i; - ListView_GetItem(hwndLV, &item); + SendMessage( hwndLV, LVM_GETITEM, 0, (LPARAM)&item ); free(((LINE_INFO*)item.lParam)->name); HeapFree(GetProcessHeap(), 0, (void*)item.lParam); } g_columnToSort = ~0UL; - ListView_DeleteAllItems(hwndLV); + SendMessage( hwndLV, LVM_DELETEALLITEMS, 0, 0L ); /* get size information and resize the buffers if necessary */ errCode = RegQueryInfoKey(hKey, NULL, NULL, NULL, NULL, &max_sub_key_len, NULL, @@ -524,7 +523,7 @@ BOOL RefreshListView(HWND hwndLV, HKEY h bSelected = TRUE; AddEntryToList(hwndLV, valName[0] ? valName : NULL, valType, valBuf, valSize, bSelected); } - ListView_SortItems(hwndLV, CompareFunc, hwndLV); + SendMessage(hwndLV, LVM_SORTITEMS, (WPARAM)hwndLV, (LPARAM)CompareFunc); g_currentRootKey = hKeyRoot; if (keyPath != g_currentPath) {

1 0

Mike McCormack : shell32: Fix some gcc 4. 1 warnings caused by casts in macros.
by Alexandre Julliard 03 Mar '06

03 Mar '06

Module: wine Branch: refs/heads/master Commit: 959edd5cc491e29e1d451d18e439389e52ec944a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=959edd5cc491e29e1d451d1… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 3 12:28:14 2006 +0900 shell32: Fix some gcc 4.1 warnings caused by casts in macros. --- dlls/shell32/brsfolder.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index aba8e23..6d5afe1 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -108,7 +108,7 @@ static void InitializeTreeView( browse_i Shell_GetImageList(NULL, &hImageList); if (hImageList) - TreeView_SetImageList( info->hwndTreeView, hImageList, 0 ); + SendMessageW( info->hwndTreeView, TVM_SETIMAGELIST, 0, (LPARAM)hImageList ); /* We want to call InsertTreeViewItem down the code, in order to insert * the root item of the treeview. Due to InsertTreeViewItem's signature, @@ -166,10 +166,10 @@ static void InitializeTreeView( browse_i return; } - TreeView_DeleteAllItems( info->hwndTreeView ); + SendMessageW( info->hwndTreeView, TVM_DELETEITEM, 0, (LPARAM)TVI_ROOT ); item = InsertTreeViewItem( info, lpsfParent, pidlChild, pidlParent, pEnumChildren, TVI_ROOT ); - TreeView_Expand( info->hwndTreeView, item, TVE_EXPAND ); + SendMessageW( info->hwndTreeView, TVM_EXPAND, TVE_EXPAND, (LPARAM)item ); IShellFolder_Release(lpsfRoot); IShellFolder_Release(lpsfParent); @@ -440,7 +440,8 @@ static LRESULT BrsFolder_Treeview_Expand /* My Computer is already sorted and trying to do a simple text * sort will only mess things up */ if (!_ILIsMyComputer(lptvid->lpi)) - TreeView_SortChildren(info->hwndTreeView, pnmtv->itemNew.hItem, FALSE); + SendMessageW( info->hwndTreeView, TVM_SORTCHILDREN, + FALSE, (LPARAM)pnmtv->itemNew.hItem ); return 0; }

1 0

Mike McCormack : winecfg: Eliminate some gcc 4. 1 warnings caused by casts in macros.
by Alexandre Julliard 03 Mar '06

03 Mar '06

Module: wine Branch: refs/heads/master Commit: abfc9b8c272a1367f2d41494abdb0fd7b7d512a4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=abfc9b8c272a1367f2d4149… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 3 12:32:00 2006 +0900 winecfg: Eliminate some gcc 4.1 warnings caused by casts in macros. --- programs/winecfg/audio.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 07a4baf..490e05a 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -205,7 +205,7 @@ static void initAudioDeviceTree(HWND hDl hBitMap = LoadBitmap(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_CHECKBOX)); ImageList_Add(hImageList, hBitMap, NULL); DeleteObject(hBitMap); - TreeView_SetImageList(tree, hImageList, TVSIL_STATE); + SendMessageW( tree, LVM_SETIMAGELIST, TVSIL_STATE, (LPARAM)hImageList ); /* root item */ insert.hParent = TVI_ROOT; @@ -702,14 +702,14 @@ AudioDlgProc (HWND hDlg, UINT uMsg, WPAR ht.pt.x = GET_X_LPARAM(dwPos); ht.pt.y = GET_Y_LPARAM(dwPos); MapWindowPoints(HWND_DESKTOP, tree, &ht.pt, 1); - TreeView_HitTest(tree, &ht); + SendMessageW( tree, TVM_HITTEST, 0, (LPARAM)&ht ); if (TVHT_ONITEMSTATEICON & ht.flags) { TVITEM tvItem; int index; ZeroMemory(&tvItem, sizeof(tvItem)); tvItem.hItem = ht.hItem; - TreeView_GetItem(tree, &tvItem); + SendMessageW( tree, TVM_GETITEMW, 0, (LPARAM) &tvItem ); index = TreeView_GetItemState(tree, ht.hItem, TVIS_STATEIMAGEMASK); if (index == INDEXTOSTATEIMAGEMASK(1)) @@ -739,7 +739,7 @@ AudioDlgProc (HWND hDlg, UINT uMsg, WPAR pt.y = GET_Y_LPARAM(dwPos); ht.pt = pt; MapWindowPoints(HWND_DESKTOP, tree, &ht.pt, 1); - TreeView_HitTest(tree, &ht); + SendMessageW( tree, TVM_HITTEST, 0, (LPARAM)&ht ); if (TVHT_ONITEMLABEL & ht.flags) { TVITEM tvItem;

1 0

Mike McCormack : msrle32: Fix some gcc 4. 1 warnings caused by casts in windowsx.h macros.
by Alexandre Julliard 03 Mar '06

03 Mar '06

Module: wine Branch: refs/heads/master Commit: 29c3a54339f2041169cf3831b6829b3dad4bd3da URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=29c3a54339f2041169cf383… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 3 12:26:36 2006 +0900 msrle32: Fix some gcc 4.1 warnings caused by casts in windowsx.h macros. --- dlls/msrle32/msrle32.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 3fb6c62..6f44048 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -27,7 +27,6 @@ #include "winnls.h" #include "winuser.h" -#include "windowsx.h" #include "wine/debug.h" @@ -1387,10 +1386,10 @@ static LRESULT CompressBegin(CodecInfo * CompressEnd(pi); size = WIDTHBYTES(lpbiOut->biWidth * 16) / 2 * lpbiOut->biHeight; - pi->pPrevFrame = (LPWORD)GlobalAllocPtr(GPTR, size * sizeof(WORD)); + pi->pPrevFrame = GlobalLock(GlobalAlloc(GPTR, size * sizeof(WORD))); if (pi->pPrevFrame == NULL) return ICERR_MEMORY; - pi->pCurFrame = (LPWORD)GlobalAllocPtr(GPTR, size * sizeof(WORD)); + pi->pCurFrame = GlobalLock(GlobalAlloc(GPTR, size * sizeof(WORD))); if (pi->pCurFrame == NULL) { CompressEnd(pi); return ICERR_MEMORY; @@ -1534,9 +1533,15 @@ static LRESULT CompressEnd(CodecInfo *pi if (pi != NULL) { if (pi->pPrevFrame != NULL) - GlobalFreePtr(pi->pPrevFrame); + { + GlobalUnlock(GlobalHandle(pi->pPrevFrame)); + GlobalFree(GlobalHandle(pi->pPrevFrame)); + } if (pi->pCurFrame != NULL) - GlobalFreePtr(pi->pCurFrame); + { + GlobalUnlock(GlobalHandle(pi->pCurFrame)); + GlobalFree(GlobalHandle(pi->pCurFrame)); + } pi->pPrevFrame = NULL; pi->pCurFrame = NULL; pi->nPrevFrame = -1;

1 0

Mike McCormack : hhctrl.ocx: Fix a gcc 4. 1 warning caused by a cast in a macro.
by Alexandre Julliard 03 Mar '06

03 Mar '06

Module: wine Branch: refs/heads/master Commit: 1006cfc8dff4677c6c96792cc30bd88e63a5ed73 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1006cfc8dff4677c6c96792… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 3 12:26:00 2006 +0900 hhctrl.ocx: Fix a gcc 4.1 warning caused by a cast in a macro. --- dlls/hhctrl.ocx/help.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index b60e83d..aa3d61f 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -492,7 +492,7 @@ static void NP_CreateTab(HINSTANCE hInst tie.mask = TCIF_TEXT; tie.pszText = tabText; - TabCtrl_InsertItemW(hwndTabCtrl, dwIndex, &tie); + SendMessageW( hwndTabCtrl, TCM_INSERTITEMW, dwIndex, (LPARAM)&tie ); HeapFree(GetProcessHeap(), 0, tabText); }

1 0

Mike McCormack : comctl32: Fix some gcc 4.1 warnings caused by windowsx. h macros.
by Alexandre Julliard 03 Mar '06

03 Mar '06

Module: wine Branch: refs/heads/master Commit: 2dfe50aa3f91888fd1ac14731229e475a3545248 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2dfe50aa3f91888fd1ac147… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 3 12:25:36 2006 +0900 comctl32: Fix some gcc 4.1 warnings caused by windowsx.h macros. --- dlls/comctl32/listview.c | 12 ++++++------ dlls/comctl32/pager.c | 11 +++++------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index f51b34d..9210e8d 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5819,7 +5819,7 @@ static INT LISTVIEW_GetNextItem(LISTVIEW } lvFindInfo.flags = LVFI_NEARESTXY; lvFindInfo.vkDirection = VK_UP; - ListView_GetItemPosition(infoPtr->hwndSelf, nItem, &lvFindInfo.pt); + SendMessageW( infoPtr->hwndSelf, LVM_GETITEMPOSITION, nItem, (LPARAM)&lvFindInfo.pt ); while ((nItem = ListView_FindItemW(infoPtr->hwndSelf, nItem, &lvFindInfo)) != -1) { if ((ListView_GetItemState(infoPtr->hwndSelf, nItem, uMask) & uMask) == uMask) @@ -5854,7 +5854,7 @@ static INT LISTVIEW_GetNextItem(LISTVIEW } lvFindInfo.flags = LVFI_NEARESTXY; lvFindInfo.vkDirection = VK_DOWN; - ListView_GetItemPosition(infoPtr->hwndSelf, nItem, &lvFindInfo.pt); + SendMessageW( infoPtr->hwndSelf, LVM_GETITEMPOSITION, nItem, (LPARAM)&lvFindInfo.pt ); while ((nItem = ListView_FindItemW(infoPtr->hwndSelf, nItem, &lvFindInfo)) != -1) { if ((LISTVIEW_GetItemState(infoPtr, nItem, uMask) & uMask) == uMask) @@ -5890,7 +5890,7 @@ static INT LISTVIEW_GetNextItem(LISTVIEW } lvFindInfo.flags = LVFI_NEARESTXY; lvFindInfo.vkDirection = VK_LEFT; - ListView_GetItemPosition(infoPtr->hwndSelf, nItem, &lvFindInfo.pt); + SendMessageW( infoPtr->hwndSelf, LVM_GETITEMPOSITION, nItem, (LPARAM)&lvFindInfo.pt ); while ((nItem = ListView_FindItemW(infoPtr->hwndSelf, nItem, &lvFindInfo)) != -1) { if ((ListView_GetItemState(infoPtr->hwndSelf, nItem, uMask) & uMask) == uMask) @@ -5926,7 +5926,7 @@ static INT LISTVIEW_GetNextItem(LISTVIEW } lvFindInfo.flags = LVFI_NEARESTXY; lvFindInfo.vkDirection = VK_RIGHT; - ListView_GetItemPosition(infoPtr->hwndSelf, nItem, &lvFindInfo.pt); + SendMessageW( infoPtr->hwndSelf, LVM_GETITEMPOSITION, nItem, (LPARAM)&lvFindInfo.pt ); while ((nItem = ListView_FindItemW(infoPtr->hwndSelf, nItem, &lvFindInfo)) != -1) { if ((LISTVIEW_GetItemState(infoPtr, nItem, uMask) & uMask) == uMask) @@ -8907,7 +8907,7 @@ static void LISTVIEW_UpdateSize(LISTVIEW hl.prc = &infoPtr->rcList; hl.pwpos = &wp; - Header_Layout(infoPtr->hwndHeader, &hl); + SendMessageW( infoPtr->hwndHeader, HDM_LAYOUT, 0, (LPARAM)&hl ); SetWindowPos(wp.hwnd, wp.hwndInsertAfter, wp.x, wp.y, wp.cx, wp.cy, wp.flags); @@ -8985,7 +8985,7 @@ static INT LISTVIEW_StyleChanged(LISTVIE hl.prc = &infoPtr->rcList; hl.pwpos = &wp; - Header_Layout(infoPtr->hwndHeader, &hl); + SendMessageW( infoPtr->hwndHeader, HDM_LAYOUT, 0, (LPARAM)&hl ); SetWindowPos(infoPtr->hwndHeader, infoPtr->hwndSelf, wp.x, wp.y, wp.cx, wp.cy, wp.flags); } diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index cd25159..15e0e09 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -59,7 +59,6 @@ #include "wingdi.h" #include "winuser.h" #include "winnls.h" -#include "windowsx.h" #include "commctrl.h" #include "comctl32.h" #include "wine/debug.h" @@ -1315,7 +1314,7 @@ PAGER_WindowProc (HWND hwnd, UINT uMsg, return PAGER_Destroy (infoPtr); case WM_SIZE: - return PAGER_Size (infoPtr, (INT)wParam, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); + return PAGER_Size (infoPtr, (INT)wParam, (short)LOWORD(lParam), (short)HIWORD(lParam)); case WM_NCPAINT: return PAGER_NCPaint (infoPtr, (HRGN)wParam); @@ -1330,18 +1329,18 @@ PAGER_WindowProc (HWND hwnd, UINT uMsg, return PAGER_NCCalcSize (infoPtr, wParam, (LPRECT)lParam); case WM_NCHITTEST: - return PAGER_NCHitTest (infoPtr, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); + return PAGER_NCHitTest (infoPtr, (short)LOWORD(lParam), (short)HIWORD(lParam)); case WM_MOUSEMOVE: if (infoPtr->bForward && infoPtr->hwndChild) PostMessageW(infoPtr->hwndChild, WM_MOUSEMOVE, wParam, lParam); - return PAGER_MouseMove (infoPtr, (INT)wParam, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); + return PAGER_MouseMove (infoPtr, (INT)wParam, (short)LOWORD(lParam), (short)HIWORD(lParam)); case WM_LBUTTONDOWN: - return PAGER_LButtonDown (infoPtr, (INT)wParam, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); + return PAGER_LButtonDown (infoPtr, (INT)wParam, (short)LOWORD(lParam), (short)HIWORD(lParam)); case WM_LBUTTONUP: - return PAGER_LButtonUp (infoPtr, (INT)wParam, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); + return PAGER_LButtonUp (infoPtr, (INT)wParam, (short)LOWORD(lParam), (short)HIWORD(lParam)); case WM_ERASEBKGND: return PAGER_EraseBackground (infoPtr, (HDC)wParam);

1 0

Francois Gouget : kernel: Protect sys/resource.h include.
by Alexandre Julliard 03 Mar '06

03 Mar '06

Module: wine Branch: refs/heads/master Commit: 2f29c779d48b027773a57ff383cbc29d6bb81ccf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2f29c779d48b027773a57ff… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 2 19:37:37 2006 +0100 kernel: Protect sys/resource.h include. --- dlls/kernel/heap.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/heap.c b/dlls/kernel/heap.c index 3df7bbc..59a5e9f 100644 --- a/dlls/kernel/heap.c +++ b/dlls/kernel/heap.c @@ -44,7 +44,9 @@ /* FIXME: Unfortunately swapctl can't be used with largefile.... */ # undef _FILE_OFFSET_BITS # define _FILE_OFFSET_BITS 32 -# include <sys/resource.h> +# ifdef HAVE_SYS_RESOURCE_H +# include <sys/resource.h> +# endif # ifdef HAVE_SYS_STAT_H # include <sys/stat.h> # endif

1 0

Francois Gouget : d3d: Fix Validate(Pixel|Vertex)Shader() prototypes.
by Alexandre Julliard 03 Mar '06

03 Mar '06

Module: wine Branch: refs/heads/master Commit: 339a4dbd5bc7383bce9aad1898f6c951e6d5f722 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=339a4dbd5bc7383bce9aad1… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 2 19:40:33 2006 +0100 d3d: Fix Validate(Pixel|Vertex)Shader() prototypes. Fix Validate(Pixel|Vertex)Shader() prototypes so they match the spec file. Fix the stub message so it is more standard and use consistent parameter names. --- dlls/d3d8/d3d8_main.c | 8 ++++---- dlls/d3d9/d3d9_main.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index be37d41..67120ec 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -75,9 +75,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, * PARAMS * toto result? */ -BOOL WINAPI ValidateVertexShader(LPVOID pFunction, int foo, int bar, void *fee, int rab) +BOOL WINAPI ValidateVertexShader(LPVOID pFunction, int param1, int param2, LPVOID toto) { - FIXME("(void): stub: %p %d %d %p %d\n", pFunction, foo, bar, fee, rab); + FIXME("(%p %d %d %p): stub\n", pFunction, param1, param2, toto); return TRUE; } @@ -87,8 +87,8 @@ BOOL WINAPI ValidateVertexShader(LPVOID * PARAMS * toto result? */ -BOOL WINAPI ValidatePixelShader(LPVOID pFunction, int foo, int bar, void *fee, int rab) +BOOL WINAPI ValidatePixelShader(LPVOID pFunction, int param1, int param2, LPVOID toto) { - FIXME("(void): stub: %p %d %d %p %d\n", pFunction, foo, bar, fee, rab); + FIXME("(%p %d %d %p): stub\n", pFunction, param1, param2, toto); return TRUE; } diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index e249a32..b2b758e 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -78,7 +78,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, */ BOOL WINAPI ValidateVertexShader(LPVOID pFunction, int param1, int param2, LPVOID toto) { - FIXME("(void): stub: %p %d %d %p\n", pFunction, param1, param2, toto); + FIXME("(%p %d %d %p): stub\n", pFunction, param1, param2, toto); return TRUE; } @@ -90,6 +90,6 @@ BOOL WINAPI ValidateVertexShader(LPVOID */ BOOL WINAPI ValidatePixelShader(LPVOID pFunction, int param1, int param2, LPVOID toto) { - FIXME("(void): stub: %p %d %d %p\n", pFunction, param1, param2, toto); + FIXME("(%p %d %d %p): stub\n", pFunction, param1, param2, toto); return TRUE; }

1 0

Juan Lang : crypt32: Implement CertDuplicateStore.
by Alexandre Julliard 03 Mar '06

03 Mar '06

Module: wine Branch: refs/heads/master Commit: 8949d29de2c31ce4839d3ae4d9588b2fb0320406 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8949d29de2c31ce4839d3ae… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Mar 2 06:55:45 2006 -0800 crypt32: Implement CertDuplicateStore. --- dlls/crypt32/crypt32.spec | 2 +- dlls/crypt32/store.c | 10 ++++++++++ include/wincrypt.h | 2 ++ 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index abeff35..7d40394 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -26,7 +26,7 @@ @ stub CertDuplicateCRLContext @ stub CertDuplicateCTLContext @ stdcall CertDuplicateCertificateContext(ptr) -@ stub CertDuplicateStore +@ stdcall CertDuplicateStore(ptr) @ stub CertEnumCRLContextProperties @ stdcall CertEnumCRLsInStore(ptr ptr) @ stub CertEnumCTLContextProperties diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 47e595c..b8a3d0f 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -2626,6 +2626,16 @@ PCCTL_CONTEXT WINAPI CertEnumCTLsInStore return NULL; } +HCERTSTORE WINAPI CertDuplicateStore(HCERTSTORE hCertStore) +{ + WINECRYPT_CERTSTORE *hcs = (WINECRYPT_CERTSTORE *)hCertStore; + + TRACE("(%p)\n", hCertStore); + + if (hcs && hcs->dwMagic == WINE_CRYPTCERTSTORE_MAGIC) + InterlockedIncrement(&hcs->ref); + return hCertStore; +} BOOL WINAPI CertCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) { diff --git a/include/wincrypt.h b/include/wincrypt.h index 678f466..9784223 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2605,6 +2605,8 @@ BOOL WINAPI CertSetStoreProperty(HCERTST BOOL WINAPI CertControlStore(HCERTSTORE hCertStore, DWORD dwFlags, DWORD dwCtrlType, void const *pvCtrlPara); +HCERTSTORE WINAPI CertDuplicateStore(HCERTSTORE hCertStore); + BOOL WINAPI CertCloseStore( HCERTSTORE hCertStore, DWORD dwFlags ); BOOL WINAPI CertFreeCertificateContext( PCCERT_CONTEXT pCertContext );

1 0

Alexandre Julliard : Release 0.9.9.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: a2bc9df948883ee531a59bb514795b6e3a63a9bd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a2bc9df948883ee531a59bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 2 18:16:27 2006 +0100 Release 0.9.9. --- ANNOUNCE | 18 - ChangeLog | 1574 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 configure | 18 - 4 files changed, 1594 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=a2bc9df948883ee531a…

1 0