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

Mike McCormack : avifil32: Use HeapAlloc instead of GlobalAlloc. Eliminate windowsx.h.
by Alexandre Julliard March 18, 2006

March 18, 2006

Module: wine Branch: refs/heads/master Commit: 417067bb0d0323af5100e45cba05afedbeffc28a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=417067bb0d0323af5100e45… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Mar 18 10:17:33 2006 +0900 avifil32: Use HeapAlloc instead of GlobalAlloc. Eliminate windowsx.h. --- dlls/avifil32/avifile.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index c6f4827..b89a454 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -40,7 +40,6 @@ #include "winuser.h" #include "winnls.h" #include "winerror.h" -#include "windowsx.h" #include "mmsystem.h" #include "vfw.h" @@ -1341,7 +1340,7 @@ static HRESULT WINAPI IAVIStream_fnWrite return AVIERR_UNSUPPORTED; } - This->lpHandlerData = GlobalAllocPtr(GMEM_MOVEABLE, size); + This->lpHandlerData = HeapAlloc(GetProcessHeap(), 0, size); if (This->lpHandlerData == NULL) return AVIERR_MEMORY; This->cbHandlerData = size; @@ -1576,7 +1575,7 @@ static void AVIFILE_DestructAVIStream This->cbBuffer = 0; } if (This->lpHandlerData != NULL) { - GlobalFreePtr(This->lpHandlerData); + HeapFree(GetProcessHeap(), 0, This->lpHandlerData); This->lpHandlerData = NULL; This->cbHandlerData = 0; } @@ -1687,8 +1686,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFile case ckidSTREAMHANDLERDATA: if (pStream->lpHandlerData != NULL) return AVIERR_BADFORMAT; - pStream->lpHandlerData = GlobalAllocPtr(GMEM_DDESHARE|GMEM_MOVEABLE, - ck.cksize); + pStream->lpHandlerData = HeapAlloc(GetProcessHeap(), 0, ck.cksize); if (pStream->lpHandlerData == NULL) return AVIERR_MEMORY; pStream->cbHandlerData = ck.cksize; @@ -1702,8 +1700,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFile if (ck.cksize == 0) break; - pStream->lpFormat = GlobalAllocPtr(GMEM_DDESHARE|GMEM_MOVEABLE, - ck.cksize); + pStream->lpFormat = HeapAlloc(GetProcessHeap(), 0, ck.cksize); if (pStream->lpFormat == NULL) return AVIERR_MEMORY; pStream->cbFormat = ck.cksize;

1 0

Mike McCormack : taskmgr: Fix some gcc 4.1 warnings.
by Alexandre Julliard March 18, 2006

March 18, 2006

Module: wine Branch: refs/heads/master Commit: ca4f8dd83c0a6f5c93687997f5245e087bd51777 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ca4f8dd83c0a6f5c9368799… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 17 22:49:49 2006 +0900 taskmgr: Fix some gcc 4.1 warnings. --- programs/taskmgr/dbgchnl.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/taskmgr/dbgchnl.c b/programs/taskmgr/dbgchnl.c index a80aedf..4b8f362 100644 --- a/programs/taskmgr/dbgchnl.c +++ b/programs/taskmgr/dbgchnl.c @@ -92,7 +92,7 @@ static DWORD get_selected_pid(void) lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + SendMessage(hProcessPageListCtrl, LVM_GETITEM, 0, (LPARAM) &lvitem); if (lvitem.state & LVIS_SELECTED) break; @@ -209,7 +209,7 @@ static void DebugChannels_FillList(HWND { HANDLE hProcess; - ListView_DeleteAllItems(hChannelLV); + SendMessage(hChannelLV, LVM_DELETEALLITEMS, 0, 0); hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_OPERATION | PROCESS_VM_READ, FALSE, get_selected_pid()); if (!hProcess) return; /* FIXME messagebox */ @@ -228,31 +228,31 @@ static void DebugChannels_OnCreate(HWND lvc.fmt = LVCFMT_LEFT; lvc.pszText = _T("Debug Channel"); lvc.cx = 100; - ListView_InsertColumn(hLV, 0, &lvc); + SendMessage(hLV, LVM_INSERTCOLUMN, 0, (LPARAM) &lvc); lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_CENTER; lvc.pszText = _T("Fixme"); lvc.cx = 55; - ListView_InsertColumn(hLV, 1, &lvc); + SendMessage(hLV, LVM_INSERTCOLUMN, 1, (LPARAM) &lvc); lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_CENTER; lvc.pszText = _T("Err"); lvc.cx = 55; - ListView_InsertColumn(hLV, 2, &lvc); + SendMessage(hLV, LVM_INSERTCOLUMN, 2, (LPARAM) &lvc); lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_CENTER; lvc.pszText = _T("Warn"); lvc.cx = 55; - ListView_InsertColumn(hLV, 3, &lvc); + SendMessage(hLV, LVM_INSERTCOLUMN, 3, (LPARAM) &lvc); lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_CENTER; lvc.pszText = _T("Trace"); lvc.cx = 55; - ListView_InsertColumn(hLV, 4, &lvc); + SendMessage(hLV, LVM_INSERTCOLUMN, 4, (LPARAM) &lvc); DebugChannels_FillList(hLV); }

1 0

Mike McCormack : winecfg: Fix some gcc 4.1 warnings.
by Alexandre Julliard March 18, 2006

March 18, 2006

Module: wine Branch: refs/heads/master Commit: a3b7a0729f6a94f343ee598febf6aea429c99633 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a3b7a0729f6a94f343ee598… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 17 22:49:27 2006 +0900 winecfg: Fix some gcc 4.1 warnings. --- programs/winecfg/appdefaults.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 681d21c..78874a0 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -130,7 +130,7 @@ static void add_listview_item(HWND listv item.lParam = (LPARAM) association; item.iItem = ListView_GetItemCount(listview); - ListView_InsertItem(listview, &item); + SendMessage(listview, LVM_INSERTITEM, 0, (LPARAM) &item); } /* Called when the application is initialized (cannot reinit!) */ @@ -179,7 +179,7 @@ static void init_appsheet(HWND dialog) item.state = LVIS_SELECTED | LVIS_FOCUSED; item.stateMask = LVIS_SELECTED | LVIS_FOCUSED; - ListView_SetItem(listview, &item); + SendMessage(listview, LVM_SETITEM, 0, (LPARAM) &item); } } @@ -214,7 +214,7 @@ static void on_selection_change(HWND dia if (item.iItem == -1) return; - ListView_GetItem(listview, &item); + SendMessage(listview, LVM_GETITEM, 0, (LPARAM) &item); current_app = (char *) item.lParam; @@ -301,7 +301,7 @@ static void on_remove_app_click(HWND dia section[strlen(section)] = '\0'; /* remove last backslash */ set_reg_key(config_key, section, NULL, NULL); /* delete the section */ - ListView_DeleteItem(listview, selection); + SendMessage(listview, LVM_DELETEITEM, selection, 0); ListView_SetItemState(listview, selection - 1, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED); SetFocus(listview);

1 0

Mike McCormack : crypt32: Fix a warning.
by Alexandre Julliard March 18, 2006

March 18, 2006

Module: wine Branch: refs/heads/master Commit: 32f6b71c769b443f648f498e7061b8591fc7917a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=32f6b71c769b443f648f498… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 17 22:48:56 2006 +0900 crypt32: Fix a warning. --- dlls/crypt32/tests/store.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 68356f7..bc52ebf 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -267,7 +267,7 @@ static void testGetSubjectCert(void) store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); - ok(store, "CertOpenStore failed: %ld\n", GetLastError()); + ok(store != NULL, "CertOpenStore failed: %ld\n", GetLastError()); if (store != NULL) { PCCERT_CONTEXT context1, context2;

1 0

YunSong Hwang : msvfw32: Update Korean resources.
by Alexandre Julliard March 17, 2006

March 17, 2006

Module: wine Branch: refs/heads/master Commit: b07299f185be6091b44d8a0004e9526f4f738a66 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b07299f185be6091b44d8a0… Author: YunSong Hwang <hys545(a)dreamwiz.com> Date: Fri Mar 17 18:33:30 2006 +0900 msvfw32: Update Korean resources. --- dlls/msvfw32/msvfw32_Ko.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvfw32/msvfw32_Ko.rc b/dlls/msvfw32/msvfw32_Ko.rc index 4ed2c24..ebb3a33 100644 --- a/dlls/msvfw32/msvfw32_Ko.rc +++ b/dlls/msvfw32/msvfw32_Ko.rc @@ -1,6 +1,6 @@ /* * Copyright 2005 Dmitry Timoshkov - * Copyright 2005 YunSong Hwang + * Copyright 2005,2006 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,13 +21,13 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Video Compression" +CAPTION "�� " FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "Ȯ��",IDOK,129,2,49,14 PUSHBUTTON "��",IDCANCEL,129,18,49,14 - LTEXT "��(&Co):",-1,9,6,105,8 + LTEXT "��(&C):",-1,9,6,105,8 COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP PUSHBUTTON "��(&f)...",882,129,36,49,14

1 0

Mike McCormack : taskmgr: Fix some gcc 4.1 warnings.
by Alexandre Julliard March 17, 2006

March 17, 2006

Module: wine Branch: refs/heads/master Commit: 2d8459575e688a934126532c210b35990f1f87b7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2d8459575e688a934126532… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 17 18:38:55 2006 +0900 taskmgr: Fix some gcc 4.1 warnings. --- programs/taskmgr/taskmgr.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index c784d04..6c56a8c 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -504,17 +504,17 @@ BOOL OnCreate(HWND hWnd) memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = szTemp; - TabCtrl_InsertItem(hTabWnd, 0, &item); + SendMessage(hTabWnd, TCM_INSERTITEM, 0, (LPARAM)&item); _tcscpy(szTemp, _T("Processes")); memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = szTemp; - TabCtrl_InsertItem(hTabWnd, 1, &item); + SendMessage(hTabWnd, TCM_INSERTITEM, 1, (LPARAM)&item); _tcscpy(szTemp, _T("Performance")); memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = szTemp; - TabCtrl_InsertItem(hTabWnd, 2, &item); + SendMessage(hTabWnd, TCM_INSERTITEM, 2, (LPARAM)&item); /* Size everything correctly */ GetClientRect(hWnd, &rc);

1 0

Mike McCormack : taskmgr: Fix some gcc 4.1 warnings.
by Alexandre Julliard March 17, 2006

March 17, 2006

Module: wine Branch: refs/heads/master Commit: 489d61348a0feca34820dd6279cf3ef748033b8a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=489d61348a0feca34820dd6… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 17 18:37:41 2006 +0900 taskmgr: Fix some gcc 4.1 warnings. --- programs/taskmgr/procpage.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/taskmgr/procpage.c b/programs/taskmgr/procpage.c index 6f7e9cb..667e747 100644 --- a/programs/taskmgr/procpage.c +++ b/programs/taskmgr/procpage.c @@ -85,7 +85,7 @@ ProcessPageWndProc(HWND hDlg, UINT messa */ SendMessage(hProcessPageListCtrl, WM_SETFONT, SendMessage(hProcessPage, WM_GETFONT, 0, 0), TRUE); SetWindowText(hProcessPageListCtrl, _T("Processes")); - ListView_SetExtendedListViewStyle(hProcessPageListCtrl, ListView_GetExtendedListViewStyle(hProcessPageListCtrl) | LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP); + SendMessage(hProcessPageListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, ListView_GetExtendedListViewStyle(hProcessPageListCtrl) | LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP); AddColumns(); @@ -348,7 +348,7 @@ void ProcessPageOnNotify(WPARAM wParam, lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + SendMessage(hProcessPageListCtrl, LVM_GETITEM, 0, (LPARAM) &lvitem); if (lvitem.state & LVIS_SELECTED) break;

1 0

Mike McCormack : taskmgr: Fix some gcc 4.1 warnings.
by Alexandre Julliard March 17, 2006

March 17, 2006

Module: wine Branch: refs/heads/master Commit: 2f5293fd3cf78759d906df691da23f0d35a02c4d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2f5293fd3cf78759d906df6… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 17 18:37:23 2006 +0900 taskmgr: Fix some gcc 4.1 warnings. --- programs/taskmgr/proclist.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/programs/taskmgr/proclist.c b/programs/taskmgr/proclist.c index c21cdca..7552ab1 100644 --- a/programs/taskmgr/proclist.c +++ b/programs/taskmgr/proclist.c @@ -82,10 +82,14 @@ LRESULT CALLBACK ProcessListWndProc(HWND * subtract it from our clip rect because we don't * use icons in this list control. */ - ListView_GetItemRect(hWnd, 0, &rcClip, LVIR_BOUNDS); - ListView_GetItemRect(hWnd, ListView_GetItemCount(hWnd) - 1, &rcItem, LVIR_BOUNDS); + rcClip.left = LVIR_BOUNDS; + SendMessage(hWnd, LVM_GETITEMRECT, 0, (LPARAM) &rcClip); + rcItem.left = LVIR_BOUNDS; + SendMessage(hWnd, LVM_GETITEMRECT, ListView_GetItemCount(hWnd) - 1, (LPARAM) &rcItem); + rcClip.bottom = rcItem.bottom; - ListView_GetItemRect(hWnd, 0, &rcItem, LVIR_ICON); + rcItem.left = LVIR_ICON; + SendMessage(hWnd, LVM_GETITEMRECT, 0, (LPARAM) &rcItem); rcClip.left = rcItem.right; /*

1 0

Mike McCormack : taskmgr: Fix some gcc 4.1 warnings.
by Alexandre Julliard March 17, 2006

March 17, 2006

Module: wine Branch: refs/heads/master Commit: 33bf2e581a8a70c81595ffacd5b3efb3cfcc21ee URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=33bf2e581a8a70c81595ffa… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 17 18:37:00 2006 +0900 taskmgr: Fix some gcc 4.1 warnings. --- programs/taskmgr/debug.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/taskmgr/debug.c b/programs/taskmgr/debug.c index 2dfab7b..e6fe8a5 100644 --- a/programs/taskmgr/debug.c +++ b/programs/taskmgr/debug.c @@ -55,7 +55,7 @@ void ProcessPage_OnDebug(void) lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + SendMessage(hProcessPageListCtrl, LVM_GETITEM, 0, (LPARAM) &lvitem); if (lvitem.state & LVIS_SELECTED) break;

1 0

Mike McCormack : taskmgr: Fix some gcc 4.1 warnings.
by Alexandre Julliard March 17, 2006

March 17, 2006

Module: wine Branch: refs/heads/master Commit: 83b94fc80400e04dc18b5878dac9ca69007d1976 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=83b94fc80400e04dc18b587… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 17 18:37:11 2006 +0900 taskmgr: Fix some gcc 4.1 warnings. --- programs/taskmgr/endproc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/taskmgr/endproc.c b/programs/taskmgr/endproc.c index 13853f6..7d32477 100644 --- a/programs/taskmgr/endproc.c +++ b/programs/taskmgr/endproc.c @@ -49,7 +49,7 @@ void ProcessPage_OnEndProcess(void) lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + SendMessage(hProcessPageListCtrl, LVM_GETITEM, 0, (LPARAM) &lvitem); if (lvitem.state & LVIS_SELECTED) break; @@ -97,7 +97,7 @@ void ProcessPage_OnEndProcessTree(void) lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + SendMessage(hProcessPageListCtrl, LVM_GETITEM, 0, (LPARAM) &lvitem); if (lvitem.state & LVIS_SELECTED) break;

1 0