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

Mike McCormack : taskmgr: Fix some gcc 4.1 warnings caused by commctrl. h macros.
by Alexandre Julliard March 21, 2006

March 21, 2006

Module: wine Branch: refs/heads/master Commit: 423079eb3b5e9b41cb54cec5037b9df9a9708daa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=423079eb3b5e9b41cb54cec… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Mar 21 11:27:45 2006 +0900 taskmgr: Fix some gcc 4.1 warnings caused by commctrl.h macros. --- programs/taskmgr/applpage.c | 44 +++++++++++++++++++++++-------------------- 1 files changed, 24 insertions(+), 20 deletions(-) diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index 325f807..2f0f0e5 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -98,15 +98,19 @@ ApplicationPageWndProc(HWND hDlg, UINT m _tcscpy(szTemp, _T("Task")); column.pszText = szTemp; column.cx = 250; - ListView_InsertColumn(hApplicationPageListCtrl, 0, &column); /* Add the "Task" column */ + /* Add the "Task" column */ + SendMessage(hApplicationPageListCtrl, LVM_INSERTCOLUMN, 0, (LPARAM) &column); column.mask = LVCF_TEXT|LVCF_WIDTH; _tcscpy(szTemp, _T("Status")); column.pszText = szTemp; column.cx = 95; - ListView_InsertColumn(hApplicationPageListCtrl, 1, &column); /* Add the "Status" column */ + /* Add the "Status" column */ + SendMessage(hApplicationPageListCtrl, LVM_INSERTCOLUMN, 1, (LPARAM) &column); - ListView_SetImageList(hApplicationPageListCtrl, ImageList_Create(16, 16, ILC_COLOR8|ILC_MASK, 0, 1), LVSIL_SMALL); - ListView_SetImageList(hApplicationPageListCtrl, ImageList_Create(32, 32, ILC_COLOR8|ILC_MASK, 0, 1), LVSIL_NORMAL); + SendMessage(hApplicationPageListCtrl, LVM_SETIMAGELIST, LVSIL_SMALL, + (LPARAM) ImageList_Create(16, 16, ILC_COLOR8|ILC_MASK, 0, 1)); + SendMessage(hApplicationPageListCtrl, LVM_SETIMAGELIST, LVSIL_NORMAL, + (LPARAM) ImageList_Create(32, 32, ILC_COLOR8|ILC_MASK, 0, 1)); UpdateApplicationListControlViewSetting(); @@ -330,7 +334,7 @@ void AddOrUpdateHwnd(HWND hWnd, TCHAR *s memset(&item, 0, sizeof(LV_ITEM)); item.mask = LVIF_IMAGE|LVIF_PARAM; item.iItem = i; - ListView_GetItem(hApplicationPageListCtrl, &item); + SendMessage(hApplicationPageListCtrl, LVM_GETITEM, 0, (LPARAM) &item); pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)item.lParam; if (pAPLI->hWnd == hWnd) @@ -358,7 +362,7 @@ void AddOrUpdateHwnd(HWND hWnd, TCHAR *s ImageList_ReplaceIcon(hImageListSmall, item.iItem, hIcon); /* Update the list view */ - ListView_RedrawItems(hApplicationPageListCtrl, 0, ListView_GetItemCount(hApplicationPageListCtrl)); + SendMessage(hApplicationPageListCtrl, LVM_REDRAWITEMS, 0, ListView_GetItemCount(hApplicationPageListCtrl)); /* UpdateWindow(hApplicationPageListCtrl); */ InvalidateRect(hApplicationPageListCtrl, NULL, 0); } @@ -381,7 +385,7 @@ void AddOrUpdateHwnd(HWND hWnd, TCHAR *s item.pszText = LPSTR_TEXTCALLBACK; item.iItem = ListView_GetItemCount(hApplicationPageListCtrl); item.lParam = (LPARAM)pAPLI; - ListView_InsertItem(hApplicationPageListCtrl, &item); + SendMessage(hApplicationPageListCtrl, LVM_INSERTITEM, 0, (LPARAM) &item); } @@ -391,7 +395,7 @@ void AddOrUpdateHwnd(HWND hWnd, TCHAR *s memset(&item, 0, sizeof(LV_ITEM)); item.mask = LVIF_IMAGE|LVIF_PARAM; item.iItem = i; - ListView_GetItem(hApplicationPageListCtrl, &item); + SendMessage(hApplicationPageListCtrl, LVM_GETITEM, 0, (LPARAM) &item); pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)item.lParam; if (!IsWindow(pAPLI->hWnd)|| @@ -404,7 +408,7 @@ void AddOrUpdateHwnd(HWND hWnd, TCHAR *s ImageList_Remove(hImageListLarge, item.iItem); ImageList_Remove(hImageListSmall, item.iItem); - ListView_DeleteItem(hApplicationPageListCtrl, item.iItem); + SendMessage(hApplicationPageListCtrl, LVM_DELETEITEM, item.iItem, 0); free(pAPLI); bItemRemoved = TRUE; } @@ -423,7 +427,7 @@ void AddOrUpdateHwnd(HWND hWnd, TCHAR *s item.mask = LVIF_IMAGE; item.iItem = i; item.iImage = i; - ListView_SetItem(hApplicationPageListCtrl, &item); + SendMessage(hApplicationPageListCtrl, LVM_SETITEM, 0, (LPARAM) &item); } } @@ -566,7 +570,7 @@ void ApplicationPageOnNotify(WPARAM wPar case HDN_ITEMCLICK: - ListView_SortItems(hApplicationPageListCtrl, ApplicationPageCompareFunc, 0); + SendMessage(hApplicationPageListCtrl, LVM_SORTITEMS, 0, (LPARAM) ApplicationPageCompareFunc); bSortAscending = !bSortAscending; break; @@ -708,7 +712,7 @@ void ApplicationPage_OnWindowsTileHorizo item.mask = LVIF_STATE|LVIF_PARAM; item.iItem = i; item.stateMask = (UINT)-1; - ListView_GetItem(hApplicationPageListCtrl, &item); + SendMessage(hApplicationPageListCtrl, LVM_GETITEM, 0, (LPARAM) &item); if (item.state & LVIS_SELECTED) { pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)item.lParam; @@ -739,7 +743,7 @@ void ApplicationPage_OnWindowsTileVertic item.mask = LVIF_STATE|LVIF_PARAM; item.iItem = i; item.stateMask = (UINT)-1; - ListView_GetItem(hApplicationPageListCtrl, &item); + SendMessage(hApplicationPageListCtrl, LVM_GETITEM, 0, (LPARAM) &item); if (item.state & LVIS_SELECTED) { pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)item.lParam; @@ -765,7 +769,7 @@ void ApplicationPage_OnWindowsMinimize(v item.mask = LVIF_STATE|LVIF_PARAM; item.iItem = i; item.stateMask = (UINT)-1; - ListView_GetItem(hApplicationPageListCtrl, &item); + SendMessage(hApplicationPageListCtrl, LVM_GETITEM, 0, (LPARAM) &item); if (item.state & LVIS_SELECTED) { pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)item.lParam; if (pAPLI) { @@ -786,7 +790,7 @@ void ApplicationPage_OnWindowsMaximize(v item.mask = LVIF_STATE|LVIF_PARAM; item.iItem = i; item.stateMask = (UINT)-1; - ListView_GetItem(hApplicationPageListCtrl, &item); + SendMessage(hApplicationPageListCtrl, LVM_GETITEM, 0, (LPARAM) &item); if (item.state & LVIS_SELECTED) { pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)item.lParam; if (pAPLI) { @@ -812,7 +816,7 @@ void ApplicationPage_OnWindowsCascade(vo item.mask = LVIF_STATE|LVIF_PARAM; item.iItem = i; item.stateMask = (UINT)-1; - ListView_GetItem(hApplicationPageListCtrl, &item); + SendMessage(hApplicationPageListCtrl, LVM_GETITEM, 0, (LPARAM) &item); if (item.state & LVIS_SELECTED) { pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)item.lParam; if (pAPLI) { @@ -836,7 +840,7 @@ void ApplicationPage_OnWindowsBringToFro item.mask = LVIF_STATE|LVIF_PARAM; item.iItem = i; item.stateMask = (UINT)-1; - ListView_GetItem(hApplicationPageListCtrl, &item); + SendMessage(hApplicationPageListCtrl, LVM_GETITEM, 0, (LPARAM) &item); if (item.state & LVIS_SELECTED) { pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)item.lParam; break; @@ -860,7 +864,7 @@ void ApplicationPage_OnSwitchTo(void) item.mask = LVIF_STATE|LVIF_PARAM; item.iItem = i; item.stateMask = (UINT)-1; - ListView_GetItem(hApplicationPageListCtrl, &item); + SendMessage(hApplicationPageListCtrl, LVM_GETITEM, 0, (LPARAM) &item); if (item.state & LVIS_SELECTED) { pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)item.lParam; @@ -897,7 +901,7 @@ void ApplicationPage_OnEndTask(void) item.mask = LVIF_STATE|LVIF_PARAM; item.iItem = i; item.stateMask = (UINT)-1; - ListView_GetItem(hApplicationPageListCtrl, &item); + SendMessage(hApplicationPageListCtrl, LVM_GETITEM, 0, (LPARAM) &item); if (item.state & LVIS_SELECTED) { pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)item.lParam; if (pAPLI) { @@ -919,7 +923,7 @@ void ApplicationPage_OnGotoProcess(void) item.mask = LVIF_STATE|LVIF_PARAM; item.iItem = i; item.stateMask = (UINT)-1; - ListView_GetItem(hApplicationPageListCtrl, &item); + SendMessage(hApplicationPageListCtrl, LVM_GETITEM, 0, (LPARAM) &item); if (item.state & LVIS_SELECTED) { pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)item.lParam; break;

1 0

Mike McCormack : winefile: Fix some gcc 4.1 warnings caused by commctrl. h macros.
by Alexandre Julliard March 21, 2006

March 21, 2006

Module: wine Branch: refs/heads/master Commit: fab2e56258f02c981ddc09cd5c7687facf648dbf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fab2e56258f02c981ddc09c… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Mar 21 10:58:23 2006 +0900 winefile: Fix some gcc 4.1 warnings caused by commctrl.h macros. --- programs/winefile/winefile.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 7045bd4..745df4a 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -2595,7 +2595,7 @@ static void resize_tree(ChildWnd* child, hdl.prc = &rt; hdl.pwpos = &wp; - Header_Layout(child->left.hwndHeader, &hdl); + SendMessage(child->left.hwndHeader, HDM_LAYOUT, 0, (LPARAM)&hdl); DeferWindowPos(hdwp, child->left.hwndHeader, wp.hwndInsertAfter, wp.x-1, wp.y, child->split_pos-SPLIT_WIDTH/2+1, wp.cy, wp.flags); @@ -2631,7 +2631,7 @@ static HWND create_header(HWND parent, P hdi.pszText = g_pos_names[idx]; hdi.fmt = HDF_STRING | g_pos_align[idx]; hdi.cxy = pane->widths[idx]; - Header_InsertItem(hwnd, idx, &hdi); + SendMessage(hwnd, HDM_INSERTITEM, idx, (LPARAM) &hdi); } return hwnd; @@ -3589,18 +3589,18 @@ static void set_header(Pane* pane) for(; x+pane->widths[i]<scroll_pos && i<COLUMNS; i++) { x += pane->widths[i]; - Header_SetItem(pane->hwndHeader, i, &item); + SendMessage(pane->hwndHeader, HDM_SETITEM, i, (LPARAM) &item); } if (i < COLUMNS) { x += pane->widths[i]; item.cxy = x - scroll_pos; - Header_SetItem(pane->hwndHeader, i++, &item); + SendMessage(pane->hwndHeader, HDM_SETITEM, i++, (LPARAM) &item); for(; i<COLUMNS; i++) { item.cxy = pane->widths[i]; x += pane->widths[i]; - Header_SetItem(pane->hwndHeader, i, &item); + SendMessage(pane->hwndHeader, HDM_SETITEM, i, (LPARAM) &item); } } } @@ -3619,7 +3619,7 @@ static LRESULT pane_notify(Pane* pane, N GetClientRect(pane->hwnd, &clnt); /* move immediate to simulate HDS_FULLDRAG (for now [04/2000] not really needed with WINELIB) */ - Header_SetItem(pane->hwndHeader, idx, phdn->pitem); + SendMessage(pane->hwndHeader, HDM_SETITEM, idx, (LPARAM) phdn->pitem); pane->widths[idx] += dx; @@ -3668,7 +3668,7 @@ static LRESULT pane_notify(Pane* pane, N item.mask = HDI_WIDTH; item.cxy = pane->widths[phdn->iItem]; - Header_SetItem(pane->hwndHeader, phdn->iItem, &item); + SendMessage(pane->hwndHeader, HDM_SETITEM, phdn->iItem, (LPARAM) &item); InvalidateRect(pane->hwnd, 0, TRUE); break;} }

1 0

Roderick Colenbrander : wined3d: Don't use OpenGL 2.0.
by Alexandre Julliard March 20, 2006

March 20, 2006

Module: wine Branch: refs/heads/master Commit: a187ab05c4acd36db52554b2e23e51b12e809516 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a187ab05c4acd36db52554b… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Mar 19 23:38:23 2006 +0100 wined3d: Don't use OpenGL 2.0. --- dlls/wined3d/device.c | 20 ++++++++++++++++---- include/wine/wined3d_gl.h | 6 +++++- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3c946cd..ea74a20 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3166,11 +3166,14 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen } This->stencilfunc = func; if(!This->stateBlock->renderState[WINED3DRS_TWOSIDEDSTENCILMODE]) { +#if 0 /* Don't use OpenGL 2.0 calls for now */ if(GL_EXTCALL(glStencilFuncSeparate)) { GL_EXTCALL(glStencilFuncSeparate(GL_FRONT, func, ref, mask)); checkGLcall("glStencilFuncSeparate(GL_FRONT,...)"); } - else if(GL_SUPPORT(EXT_STENCIL_TWO_SIDE)) { + else +#endif + if(GL_SUPPORT(EXT_STENCIL_TWO_SIDE)) { glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT); checkGLcall("glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT)"); GL_EXTCALL(glActiveStencilFaceEXT(GL_FRONT)); @@ -3242,11 +3245,14 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen } if(!This->stateBlock->renderState[WINED3DRS_TWOSIDEDSTENCILMODE]) { +#if 0 /* Don't use OpenGL 2.0 calls for now */ if(GL_EXTCALL(glStencilOpSeparate)) { GL_EXTCALL(glStencilOpSeparate(GL_FRONT, stencilFail, depthFail, stencilPass)); checkGLcall("glStencilOpSeparate(GL_FRONT,...)"); } - else if(GL_SUPPORT(EXT_STENCIL_TWO_SIDE)) { + else +#endif + if(GL_SUPPORT(EXT_STENCIL_TWO_SIDE)) { glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT); checkGLcall("glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT)"); GL_EXTCALL(glActiveStencilFaceEXT(GL_FRONT)); @@ -3789,11 +3795,14 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen } if(!This->stateBlock->renderState[WINED3DRS_TWOSIDEDSTENCILMODE]) { +#if 0 /* Don't use OpenGL 2.0 calls for now */ if(GL_EXTCALL(glStencilOpSeparate)) { GL_EXTCALL(glStencilOpSeparate(GL_BACK, stencilFail, depthFail, stencilPass)); checkGLcall("glStencilOpSeparate(GL_BACK,...)"); } - else if(GL_SUPPORT(EXT_STENCIL_TWO_SIDE)) { + else +#endif + if(GL_SUPPORT(EXT_STENCIL_TWO_SIDE)) { glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT); checkGLcall("glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT)"); GL_EXTCALL(glActiveStencilFaceEXT(GL_BACK)); @@ -3836,11 +3845,14 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen } This->stencilfunc = func; if(!This->stateBlock->renderState[WINED3DRS_TWOSIDEDSTENCILMODE]) { +#if 0 /* Don't use OpenGL 2.0 calls for now */ if(GL_EXTCALL(glStencilFuncSeparate)) { GL_EXTCALL(glStencilFuncSeparate(GL_BACK, func, ref, mask)); checkGLcall("glStencilFuncSeparate(GL_BACK,...)"); } - else if(GL_SUPPORT(EXT_STENCIL_TWO_SIDE)) { + else +#endif + if(GL_SUPPORT(EXT_STENCIL_TWO_SIDE)) { glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT); checkGLcall("glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT)"); GL_EXTCALL(glActiveStencilFaceEXT(GL_BACK)); diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 08ab4a8..63e79ee 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -1237,7 +1237,9 @@ typedef enum _GL_SupportedExt { /* GL_ATI_separate_stencil */ \ USE_GL_FUNC(PGLFNSTENCILOPSEPARATEATIPROC, glStencilOpSeparateATI); \ USE_GL_FUNC(PGLFNSTENCILFUNCSEPARATEATIPROC, glStencilFuncSeparateATI); \ - /* GL_VERSION_2_0 */ \ + +/* OpenGL 2.0 functions */ +#define GL2_FUNCS_GEN \ USE_GL_FUNC(PGLFNBLENDEQUATIONSEPARATEPROC, glBlendEquationSeparate); \ USE_GL_FUNC(PGLFNDRAWBUFFERSPROC, glDrawBuffers); \ USE_GL_FUNC(PGLFNSTENCILOPSEPARATEPROC, glStencilOpSeparate); \ @@ -1388,6 +1390,8 @@ typedef struct _WineD3D_GL_Info { GL_EXT_FUNCS_GEN; /** OpenGL GLX functions ptr */ GLX_EXT_FUNCS_GEN; + /** OpenGL 2.0 functions ptr */ + /* GL2_FUNCS_GEN; */ /**/ } WineD3D_GL_Info; #undef USE_GL_FUNC

1 0

Paul Vriens : kernel: Fix model/stepping in GetSystemInfo.
by Alexandre Julliard March 20, 2006

March 20, 2006

Module: wine Branch: refs/heads/master Commit: c72f68ef0027b0ddbf023b0518656fac64530ade URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c72f68ef0027b0ddbf023b0… Author: Paul Vriens <paul.vriens(a)xs4all.nl> Date: Mon Mar 20 13:18:02 2006 +0100 kernel: Fix model/stepping in GetSystemInfo. wProcessorRevision is built from model and stepping. --- dlls/kernel/cpu.c | 62 +++++++++++++++++++++++++++++++---------------------- 1 files changed, 36 insertions(+), 26 deletions(-) diff --git a/dlls/kernel/cpu.c b/dlls/kernel/cpu.c index 5687156..6e0ef78 100644 --- a/dlls/kernel/cpu.c +++ b/dlls/kernel/cpu.c @@ -157,7 +157,7 @@ static void create_registry_keys( const /*TODO: report 64bit processors properly*/ RtlInitUnicodeString( &valueW, IdentifierW ); sprintf( id, "x86 Family %d Model %d Stepping %d", - info->wProcessorLevel /*model and family are messed up*/, info->wProcessorLevel, info->wProcessorRevision); + info->wProcessorLevel, HIBYTE(info->wProcessorRevision), LOBYTE(info->wProcessorRevision) ); RtlMultiByteToUnicodeN( idW, sizeof(idW), NULL, id, strlen(id)+1 ); NtSetValueKey( hkey, &valueW, 0, REG_SZ, idW, (strlenW(idW)+1)*sizeof(WCHAR) ); @@ -300,6 +300,26 @@ VOID WINAPI GetSystemInfo( if ((s=strchr(value,'\n'))) *s='\0'; + if (!strcasecmp(line,"processor")) { + /* processor number counts up... */ + unsigned int x; + + if (sscanf(value,"%d",&x)) + if (x+1>cachedsi.dwNumberOfProcessors) + cachedsi.dwNumberOfProcessors=x+1; + + continue; + } + if (!strcasecmp(line,"model")) { + /* First part of wProcessorRevision */ + int x; + + if (sscanf(value,"%d",&x)) + cachedsi.wProcessorRevision = cachedsi.wProcessorRevision | (x << 8); + + continue; + } + /* 2.1 method */ if (!strcasecmp(line, "cpu family")) { if (isdigit (value[0])) { @@ -356,33 +376,12 @@ VOID WINAPI GetSystemInfo( } continue; } - if (!strcasecmp(line,"fdiv_bug")) { - if (!strncasecmp(value,"yes",3)) - PF[PF_FLOATING_POINT_PRECISION_ERRATA] = TRUE; - - continue; - } - if (!strcasecmp(line,"fpu")) { - if (!strncasecmp(value,"no",2)) - PF[PF_FLOATING_POINT_EMULATED] = TRUE; - - continue; - } - if (!strcasecmp(line,"processor")) { - /* processor number counts up... */ - unsigned int x; - - if (sscanf(value,"%d",&x)) - if (x+1>cachedsi.dwNumberOfProcessors) - cachedsi.dwNumberOfProcessors=x+1; - - continue; - } if (!strcasecmp(line,"stepping")) { + /* Second part of wProcessorRevision */ int x; if (sscanf(value,"%d",&x)) - cachedsi.wProcessorRevision = x; + cachedsi.wProcessorRevision = cachedsi.wProcessorRevision | x; continue; } @@ -395,9 +394,20 @@ VOID WINAPI GetSystemInfo( } continue; } + if (!strcasecmp(line,"fdiv_bug")) { + if (!strncasecmp(value,"yes",3)) + PF[PF_FLOATING_POINT_PRECISION_ERRATA] = TRUE; + + continue; + } + if (!strcasecmp(line,"fpu")) { + if (!strncasecmp(value,"no",2)) + PF[PF_FLOATING_POINT_EMULATED] = TRUE; + + continue; + } if ( !strcasecmp(line,"flags") || - !strcasecmp(line,"features") - ) { + !strcasecmp(line,"features")) { if (strstr(value,"cx8")) PF[PF_COMPARE_EXCHANGE_DOUBLE] = TRUE; if (strstr(value,"mmx"))

1 0

Mike McCormack : taskmgr: Eliminate common code and fix a warning.
by Alexandre Julliard March 20, 2006

March 20, 2006

Module: wine Branch: refs/heads/master Commit: 1e27e1d584f1affdfbbf317e4e445822088e5db2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1e27e1d584f1affdfbbf317… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Mar 20 22:36:13 2006 +0900 taskmgr: Eliminate common code and fix a warning. --- programs/taskmgr/priority.c | 236 ++----------------------------------------- 1 files changed, 13 insertions(+), 223 deletions(-) diff --git a/programs/taskmgr/priority.c b/programs/taskmgr/priority.c index 7f76289..87a9d08 100644 --- a/programs/taskmgr/priority.c +++ b/programs/taskmgr/priority.c @@ -33,7 +33,7 @@ #include "taskmgr.h" #include "perfdata.h" -void ProcessPage_OnSetPriorityRealTime(void) +static void DoSetPriority(DWORD priority) { LVITEM lvitem; ULONG Index; @@ -49,7 +49,7 @@ void ProcessPage_OnSetPriorityRealTime(v lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + SendMessage(hProcessPageListCtrl, LVM_GETITEM, 0, (LPARAM)&lvitem); if (lvitem.state & LVIS_SELECTED) break; @@ -72,7 +72,7 @@ void ProcessPage_OnSetPriorityRealTime(v return; } - if (!SetPriorityClass(hProcess, REALTIME_PRIORITY_CLASS)) + if (!SetPriorityClass(hProcess, priority)) { GetLastErrorText(strErrorText, 260); MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); @@ -81,242 +81,32 @@ void ProcessPage_OnSetPriorityRealTime(v CloseHandle(hProcess); } -void ProcessPage_OnSetPriorityHigh(void) +void ProcessPage_OnSetPriorityRealTime(void) { - LVITEM lvitem; - ULONG Index; - DWORD dwProcessId; - HANDLE hProcess; - TCHAR strErrorText[260]; - - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) - { - memset(&lvitem, 0, sizeof(LVITEM)); - - lvitem.mask = LVIF_STATE; - lvitem.stateMask = LVIS_SELECTED; - lvitem.iItem = Index; - - ListView_GetItem(hProcessPageListCtrl, &lvitem); - - if (lvitem.state & LVIS_SELECTED) - break; - } - - dwProcessId = PerfDataGetProcessId(Index); - - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) - return; - - if (MessageBox(hMainWnd, _T("WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?"), _T("Task Manager Warning"), MB_YESNO|MB_ICONWARNING) != IDYES) - return; - - hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); - - if (!hProcess) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); - return; - } - - if (!SetPriorityClass(hProcess, HIGH_PRIORITY_CLASS)) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); - } + DoSetPriority(REALTIME_PRIORITY_CLASS); +} - CloseHandle(hProcess); +void ProcessPage_OnSetPriorityHigh(void) +{ + DoSetPriority(HIGH_PRIORITY_CLASS); } void ProcessPage_OnSetPriorityAboveNormal(void) { - LVITEM lvitem; - ULONG Index; - DWORD dwProcessId; - HANDLE hProcess; - TCHAR strErrorText[260]; - - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) - { - memset(&lvitem, 0, sizeof(LVITEM)); - - lvitem.mask = LVIF_STATE; - lvitem.stateMask = LVIS_SELECTED; - lvitem.iItem = Index; - - ListView_GetItem(hProcessPageListCtrl, &lvitem); - - if (lvitem.state & LVIS_SELECTED) - break; - } - - dwProcessId = PerfDataGetProcessId(Index); - - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) - return; - - if (MessageBox(hMainWnd, _T("WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?"), _T("Task Manager Warning"), MB_YESNO|MB_ICONWARNING) != IDYES) - return; - - hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); - - if (!hProcess) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); - return; - } - - if (!SetPriorityClass(hProcess, ABOVE_NORMAL_PRIORITY_CLASS)) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); - } - - CloseHandle(hProcess); + DoSetPriority(ABOVE_NORMAL_PRIORITY_CLASS); } void ProcessPage_OnSetPriorityNormal(void) { - LVITEM lvitem; - ULONG Index; - DWORD dwProcessId; - HANDLE hProcess; - TCHAR strErrorText[260]; - - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) - { - memset(&lvitem, 0, sizeof(LVITEM)); - - lvitem.mask = LVIF_STATE; - lvitem.stateMask = LVIS_SELECTED; - lvitem.iItem = Index; - - ListView_GetItem(hProcessPageListCtrl, &lvitem); - - if (lvitem.state & LVIS_SELECTED) - break; - } - - dwProcessId = PerfDataGetProcessId(Index); - - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) - return; - - if (MessageBox(hMainWnd, _T("WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?"), _T("Task Manager Warning"), MB_YESNO|MB_ICONWARNING) != IDYES) - return; - - hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); - - if (!hProcess) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); - return; - } - - if (!SetPriorityClass(hProcess, NORMAL_PRIORITY_CLASS)) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); - } - - CloseHandle(hProcess); + DoSetPriority(NORMAL_PRIORITY_CLASS); } void ProcessPage_OnSetPriorityBelowNormal(void) { - LVITEM lvitem; - ULONG Index; - DWORD dwProcessId; - HANDLE hProcess; - TCHAR strErrorText[260]; - - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) - { - memset(&lvitem, 0, sizeof(LVITEM)); - - lvitem.mask = LVIF_STATE; - lvitem.stateMask = LVIS_SELECTED; - lvitem.iItem = Index; - - ListView_GetItem(hProcessPageListCtrl, &lvitem); - - if (lvitem.state & LVIS_SELECTED) - break; - } - - dwProcessId = PerfDataGetProcessId(Index); - - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) - return; - - if (MessageBox(hMainWnd, _T("WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?"), _T("Task Manager Warning"), MB_YESNO|MB_ICONWARNING) != IDYES) - return; - - hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); - - if (!hProcess) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); - return; - } - - if (!SetPriorityClass(hProcess, BELOW_NORMAL_PRIORITY_CLASS)) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); - } - - CloseHandle(hProcess); + DoSetPriority(BELOW_NORMAL_PRIORITY_CLASS); } void ProcessPage_OnSetPriorityLow(void) { - LVITEM lvitem; - ULONG Index; - DWORD dwProcessId; - HANDLE hProcess; - TCHAR strErrorText[260]; - - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) - { - memset(&lvitem, 0, sizeof(LVITEM)); - - lvitem.mask = LVIF_STATE; - lvitem.stateMask = LVIS_SELECTED; - lvitem.iItem = Index; - - ListView_GetItem(hProcessPageListCtrl, &lvitem); - - if (lvitem.state & LVIS_SELECTED) - break; - } - - dwProcessId = PerfDataGetProcessId(Index); - - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) - return; - - if (MessageBox(hMainWnd, _T("WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?"), _T("Task Manager Warning"), MB_YESNO|MB_ICONWARNING) != IDYES) - return; - - hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); - - if (!hProcess) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); - return; - } - - if (!SetPriorityClass(hProcess, IDLE_PRIORITY_CLASS)) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); - } - - CloseHandle(hProcess); + DoSetPriority(IDLE_PRIORITY_CLASS); }

1 0

Mike McCormack : comctl32: Get rid of some incorrect casts.
by Alexandre Julliard March 20, 2006

March 20, 2006

Module: wine Branch: refs/heads/master Commit: ecaa525a3f153e9b7bc6e5e1a2bd5ef9557596c0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ecaa525a3f153e9b7bc6e5e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Mar 19 13:00:47 2006 +0900 comctl32: Get rid of some incorrect casts. --- dlls/comctl32/listview.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index cab119a..5ee4b2b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6740,7 +6740,7 @@ static BOOL LISTVIEW_SetColumnWidth(LIST hdi.mask = HDI_TEXT; hdi.cchTextMax = DISP_TEXT_SIZE; hdi.pszText = szDispText; - if (Header_GetItemW(infoPtr->hwndHeader, nColumn, (LPARAM)&hdi)) + if (Header_GetItemW(infoPtr->hwndHeader, nColumn, &hdi)) { HDC hdc = GetDC(infoPtr->hwndSelf); HFONT old_font = SelectObject(hdc, (HFONT)SendMessageW(infoPtr->hwndHeader, WM_GETFONT, 0, 0)); @@ -6762,7 +6762,7 @@ static BOOL LISTVIEW_SetColumnWidth(LIST hdi.mask = HDI_WIDTH; hdi.cxy = cx; TRACE("hdi.cxy=%d\n", hdi.cxy); - return Header_SetItemW(infoPtr->hwndHeader, nColumn, (LPARAM)&hdi); + return Header_SetItemW(infoPtr->hwndHeader, nColumn, &hdi); } /*** @@ -8385,7 +8385,7 @@ static LRESULT LISTVIEW_HeaderNotificati HDITEMW hdi; hdi.mask = HDI_WIDTH; - if (!Header_GetItemW(infoPtr->hwndHeader, lpnmh->iItem, (LPARAM)&hdi)) return 0; + if (!Header_GetItemW(infoPtr->hwndHeader, lpnmh->iItem, &hdi)) return 0; cxy = hdi.cxy; } else

1 0

Alexandre Julliard : configure: Add autoheader to the compile command.
by Alexandre Julliard March 20, 2006

March 20, 2006

Module: wine Branch: refs/heads/master Commit: 506fe445e32f5dda07b2ef01f3696c4e6bc210b7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=506fe445e32f5dda07b2ef0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 20 22:08:35 2006 +0100 configure: Add autoheader to the compile command. --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index bf45df5..39c8133 100644 --- a/configure.ac +++ b/configure.ac @@ -1776,5 +1776,5 @@ dnl Local Variables: dnl comment-start: "dnl " dnl comment-end: "" dnl comment-start-skip: "\\bdnl\\b\\s *" -dnl compile-command: "autoconf" +dnl compile-command: "autoconf && autoheader" dnl End:

1 0

Alexandre Julliard : configure: Use --rpath when linking dlls too.
by Alexandre Julliard March 20, 2006

March 20, 2006

Module: wine Branch: refs/heads/master Commit: 1fd32cfa137867081f3a1ebf5a22b059e4c6dc83 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1fd32cfa137867081f3a1eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 20 22:08:26 2006 +0100 configure: Use --rpath when linking dlls too. --- configure | 5 ++++- configure.ac | 1 + dlls/Makedll.rules.in | 3 ++- loader/Makefile.in | 8 ++++---- programs/Makeprog.rules.in | 3 ++- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/configure b/configure index f41e517..4cd8b6c 100755 --- a/configure +++ b/configure @@ -311,7 +311,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DLLDEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os WIN16_FILES WIN16_INSTALL SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPPBIN ac_ct_CPPBIN TOOLSDIR CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LEX LEXLIB LEX_OUTPUT_ROOT XLEX BISON AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES LN_S LN EGREP LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS FONTFORGE PKG_CONFIG PRELINK LIBPTHREAD XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS GLUT_LIBS GLUT32FILES NASLIBS XML2LIBS XML2INCL XSLTLIBS XSLTINCL CURSESLIBS sane_devel SANELIBS SANEINCL ICULIBS LCMSLIBS LDAPLIBS FREETYPELIBS FREETYPEINCL ft_devel ft_devel2 FONTSSUBDIRS ARTSCCONFIG ARTSLIBS ARTSINCL ESDCONFIG ESDLIBS ESDINCL ALSALIBS AUDIOIOLIBS EXTRACFLAGS BUILTINFLAG DLLEXT DLLFLAGS DLLIBS LDSHARED LDDLLFLAGS LIBEXT IMPLIBEXT DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP LDEXECFLAGS LDEXERPATH COREFOUNDATIONLIB IOKITLIB CROSSTEST CROSSCC CROSSWINDRES LDPATH CRTLIBS SOCKETLIBS MAIN_BINARY EXTRA_BINARIES LDD LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DLLDEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os WIN16_FILES WIN16_INSTALL SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPPBIN ac_ct_CPPBIN TOOLSDIR CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LEX LEXLIB LEX_OUTPUT_ROOT XLEX BISON AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES LN_S LN EGREP LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS FONTFORGE PKG_CONFIG PRELINK LIBPTHREAD XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS GLUT_LIBS GLUT32FILES NASLIBS XML2LIBS XML2INCL XSLTLIBS XSLTINCL CURSESLIBS sane_devel SANELIBS SANEINCL ICULIBS LCMSLIBS LDAPLIBS FREETYPELIBS FREETYPEINCL ft_devel ft_devel2 FONTSSUBDIRS ARTSCCONFIG ARTSLIBS ARTSINCL ESDCONFIG ESDLIBS ESDINCL ALSALIBS AUDIOIOLIBS EXTRACFLAGS BUILTINFLAG DLLEXT DLLFLAGS DLLIBS LDSHARED LDDLLFLAGS LIBEXT IMPLIBEXT DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP LDEXECFLAGS LDEXERPATH LDDLLRPATH COREFOUNDATIONLIB IOKITLIB CROSSTEST CROSSCC CROSSWINDRES LDPATH CRTLIBS SOCKETLIBS MAIN_BINARY EXTRA_BINARIES LDD LIBOBJS LTLIBOBJS' ac_subst_files='MAKE_RULES MAKE_DLL_RULES MAKE_IMPLIB_RULES MAKE_TEST_RULES MAKE_LIB_RULES MAKE_PROG_RULES' # Initialize some variables set by options. @@ -12899,6 +12899,8 @@ echo "${ECHO_T}$ac_cv_ld_rpath" >&6 then LDEXERPATH="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`" + LDDLLRPATH="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(dlldir) \$(libdir)\`" + fi case $host_cpu in @@ -20183,6 +20185,7 @@ s,@DLLWRAP@,$DLLWRAP,;t t s,@ac_ct_DLLWRAP@,$ac_ct_DLLWRAP,;t t s,@LDEXECFLAGS@,$LDEXECFLAGS,;t t s,@LDEXERPATH@,$LDEXERPATH,;t t +s,@LDDLLRPATH@,$LDDLLRPATH,;t t s,@COREFOUNDATIONLIB@,$COREFOUNDATIONLIB,;t t s,@IOKITLIB@,$IOKITLIB,;t t s,@CROSSTEST@,$CROSSTEST,;t t diff --git a/configure.ac b/configure.ac index fb6658e..bf45df5 100644 --- a/configure.ac +++ b/configure.ac @@ -997,6 +997,7 @@ case $host_os in if test "$ac_cv_ld_rpath" = "yes" then AC_SUBST(LDEXERPATH,["-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"]) + AC_SUBST(LDDLLRPATH,["-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(dlldir) \$(libdir)\`"]) fi case $host_cpu in diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 504ee0e..54488b9 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -13,6 +13,7 @@ DLLDEFS = @DLLDEFS@ DLLFLAGS = @DLLFLAGS@ DLLEXT = @DLLEXT@ IMPLIBEXT = @IMPLIBEXT@ +LDRPATH = @LDDLLRPATH@ DEFS = -D__WINESRC__ $(DLLDEFS) $(EXTRADEFS) BASEMODULE = $(MODULE:%.dll=%) MAINSPEC = $(BASEMODULE).spec @@ -32,7 +33,7 @@ all: $(MODULE)$(DLLEXT) $(SUBDIRS) # Rules for .so files $(MODULE).so: $(MAINSPEC) $(ALL_OBJS) Makefile.in - $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(SUBSYSTEM:%=-Wb,--subsystem,%) $(BASEADDRESS:%=-Wl,--image-base,%) -o $@ -L$(DLLDIR) $(ALL_IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) + $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(SUBSYSTEM:%=-Wb,--subsystem,%) $(BASEADDRESS:%=-Wl,--image-base,%) $(LDRPATH) -o $@ -L$(DLLDIR) $(ALL_IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) # Rules for .dll files diff --git a/loader/Makefile.in b/loader/Makefile.in index f1cfd26..25acf1e 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -26,19 +26,19 @@ all: $(WINE_BINARIES) $(MODULE) $(MANPAG LIBPTHREAD = @LIBPTHREAD@ LDEXECFLAGS = @LDEXECFLAGS@ -LDEXERPATH = @LDEXERPATH@ +LDRPATH = @LDEXERPATH@ wine-glibc: glibc.o Makefile.in - $(CC) -o $@ glibc.o $(LDEXERPATH) $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) + $(CC) -o $@ glibc.o $(LDRPATH) $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) wine-preloader: preloader.o Makefile.in $(CC) -o $@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c000000 preloader.o $(LIBPORT) $(LDFLAGS) wine-kthread: $(KTHREAD_OBJS) Makefile.in - $(CC) -o $@ $(LDEXECFLAGS) $(LDEXERPATH) $(KTHREAD_OBJS) $(LIBWINE) $(LIBPORT) $(EXTRALIBS) $(LDFLAGS) + $(CC) -o $@ $(LDEXECFLAGS) $(LDRPATH) $(KTHREAD_OBJS) $(LIBWINE) $(LIBPORT) $(EXTRALIBS) $(LDFLAGS) wine-pthread: $(PTHREAD_OBJS) Makefile.in - $(CC) -o $@ $(LDEXECFLAGS) $(LDEXERPATH) $(PTHREAD_OBJS) $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) + $(CC) -o $@ $(LDEXECFLAGS) $(LDRPATH) $(PTHREAD_OBJS) $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) $(MODULE): $(MAIN_BINARY) $(RM) $(MODULE) && $(LN_S) $(MAIN_BINARY) $(MODULE) diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in index b39d1e7..4ef0ab7 100644 --- a/programs/Makeprog.rules.in +++ b/programs/Makeprog.rules.in @@ -11,6 +11,7 @@ DLLDEFS = @DLLDEFS@ DLLFLAGS = @DLLFLAGS@ +LDRPATH = @LDDLLRPATH@ DEFS = $(DLLDEFS) $(EXTRADEFS) ALL_IMPORTS = $(DELAYIMPORTS) $(IMPORTS) ALL_LIBS = $(ALL_IMPORTS:%=-l%) -L$(LIBDIR) -lwine $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS) @@ -24,7 +25,7 @@ all: $(MODULE)$(DLLEXT) $(BASEMODULE)$(E # Rules for .so main module $(MODULE).so: $(OBJS) $(RC_SRCS:.rc=.res) Makefile.in - $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ -L$(DLLDIR) $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%) + $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(LDRPATH) -L$(DLLDIR) $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%) $(BASEMODULE): $(WINEWRAPPER) $(RM) $@ && $(LN_S) $(WINEWRAPPER) $@

1 0

Alexandre Julliard : programs: Get rid of application symlinks, they are no longer needed.
by Alexandre Julliard March 20, 2006

March 20, 2006

Module: wine Branch: refs/heads/master Commit: 02ff174bf145be734f66a53d2e646a46487b8f34 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=02ff174bf145be734f66a53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 20 20:47:58 2006 +0100 programs: Get rid of application symlinks, they are no longer needed. --- programs/Makefile.in | 190 +------------------------------------------------- programs/make_progs | 34 +-------- 2 files changed, 6 insertions(+), 218 deletions(-) diff --git a/programs/Makefile.in b/programs/Makefile.in index 87053c4..0c0426a 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -94,48 +94,9 @@ INSTALLPROGS = \ winepath \ winhelp -# Symlinks to apps that we want to run from inside the source tree -SYMLINKS = \ - aviinfo.exe$(DLLEXT) \ - aviplay.exe$(DLLEXT) \ - clock.exe$(DLLEXT) \ - cmdlgtst.exe$(DLLEXT) \ - control.exe$(DLLEXT) \ - eject.exe$(DLLEXT) \ - expand.exe$(DLLEXT) \ - explorer.exe$(DLLEXT) \ - hh.exe$(DLLEXT) \ - icinfo.exe$(DLLEXT) \ - msiexec.exe$(DLLEXT) \ - notepad.exe$(DLLEXT) \ - progman.exe$(DLLEXT) \ - regedit.exe$(DLLEXT) \ - regsvr32.exe$(DLLEXT) \ - rpcss.exe$(DLLEXT) \ - rundll32.exe$(DLLEXT) \ - start.exe$(DLLEXT) \ - taskmgr.exe$(DLLEXT) \ - uninstaller.exe$(DLLEXT) \ - view.exe$(DLLEXT) \ - wcmd.exe$(DLLEXT) \ - wineboot.exe$(DLLEXT) \ - winebrowser.exe$(DLLEXT) \ - winecfg.exe$(DLLEXT) \ - wineconsole.exe$(DLLEXT) \ - winedbg.exe$(DLLEXT) \ - winefile.exe$(DLLEXT) \ - winemenubuilder.exe$(DLLEXT) \ - winemine.exe$(DLLEXT) \ - winepath.exe$(DLLEXT) \ - winetest.exe$(DLLEXT) \ - winevdm.exe$(DLLEXT) \ - winhelp.exe$(DLLEXT) \ - winver.exe$(DLLEXT) \ - wordpad.exe$(DLLEXT) - @MAKE_RULES@ -all: wineapploader winelauncher $(SUBDIRS) $(SYMLINKS) +all: wineapploader winelauncher $(SUBDIRS) wineapploader: wineapploader.in sed -e 's,@bindir\@,$(bindir),g' $(SRCDIR)/wineapploader.in >$@ || ($(RM) $@ && false) @@ -168,157 +129,10 @@ uninstall:: -rmdir $(DESTDIR)$(dlldir) clean:: - $(RM) wineapploader winelauncher $(SYMLINKS) + $(RM) wineapploader winelauncher # Rules for testing check test:: $(SUBDIRS:%=%/__test__) -# Rules for symlinks - -aviinfo.exe$(DLLEXT): avitools/aviinfo.exe$(DLLEXT) - $(RM) $@ && $(LN_S) avitools/aviinfo.exe$(DLLEXT) $@ - -aviplay.exe$(DLLEXT): avitools/aviplay.exe$(DLLEXT) - $(RM) $@ && $(LN_S) avitools/aviplay.exe$(DLLEXT) $@ - -clock.exe$(DLLEXT): clock/clock.exe$(DLLEXT) - $(RM) $@ && $(LN_S) clock/clock.exe$(DLLEXT) $@ - -cmdlgtst.exe$(DLLEXT): cmdlgtst/cmdlgtst.exe$(DLLEXT) - $(RM) $@ && $(LN_S) cmdlgtst/cmdlgtst.exe$(DLLEXT) $@ - -control.exe$(DLLEXT): control/control.exe$(DLLEXT) - $(RM) $@ && $(LN_S) control/control.exe$(DLLEXT) $@ - -eject.exe$(DLLEXT): eject/eject.exe$(DLLEXT) - $(RM) $@ && $(LN_S) eject/eject.exe$(DLLEXT) $@ - -expand.exe$(DLLEXT): expand/expand.exe$(DLLEXT) - $(RM) $@ && $(LN_S) expand/expand.exe$(DLLEXT) $@ - -explorer.exe$(DLLEXT): explorer/explorer.exe$(DLLEXT) - $(RM) $@ && $(LN_S) explorer/explorer.exe$(DLLEXT) $@ - -hh.exe$(DLLEXT): hh/hh.exe$(DLLEXT) - $(RM) $@ && $(LN_S) hh/hh.exe$(DLLEXT) $@ - -icinfo.exe$(DLLEXT): avitools/icinfo.exe$(DLLEXT) - $(RM) $@ && $(LN_S) avitools/icinfo.exe$(DLLEXT) $@ - -msiexec.exe$(DLLEXT): msiexec/msiexec.exe$(DLLEXT) - $(RM) $@ && $(LN_S) msiexec/msiexec.exe$(DLLEXT) $@ - -notepad.exe$(DLLEXT): notepad/notepad.exe$(DLLEXT) - $(RM) $@ && $(LN_S) notepad/notepad.exe$(DLLEXT) $@ - -progman.exe$(DLLEXT): progman/progman.exe$(DLLEXT) - $(RM) $@ && $(LN_S) progman/progman.exe$(DLLEXT) $@ - -regedit.exe$(DLLEXT): regedit/regedit.exe$(DLLEXT) - $(RM) $@ && $(LN_S) regedit/regedit.exe$(DLLEXT) $@ - -regsvr32.exe$(DLLEXT): regsvr32/regsvr32.exe$(DLLEXT) - $(RM) $@ && $(LN_S) regsvr32/regsvr32.exe$(DLLEXT) $@ - -rpcss.exe$(DLLEXT): rpcss/rpcss.exe$(DLLEXT) - $(RM) $@ && $(LN_S) rpcss/rpcss.exe$(DLLEXT) $@ - -rundll32.exe$(DLLEXT): rundll32/rundll32.exe$(DLLEXT) - $(RM) $@ && $(LN_S) rundll32/rundll32.exe$(DLLEXT) $@ - -start.exe$(DLLEXT): start/start.exe$(DLLEXT) - $(RM) $@ && $(LN_S) start/start.exe$(DLLEXT) $@ - -taskmgr.exe$(DLLEXT): taskmgr/taskmgr.exe$(DLLEXT) - $(RM) $@ && $(LN_S) taskmgr/taskmgr.exe$(DLLEXT) $@ - -uninstaller.exe$(DLLEXT): uninstaller/uninstaller.exe$(DLLEXT) - $(RM) $@ && $(LN_S) uninstaller/uninstaller.exe$(DLLEXT) $@ - -view.exe$(DLLEXT): view/view.exe$(DLLEXT) - $(RM) $@ && $(LN_S) view/view.exe$(DLLEXT) $@ - -wcmd.exe$(DLLEXT): wcmd/wcmd.exe$(DLLEXT) - $(RM) $@ && $(LN_S) wcmd/wcmd.exe$(DLLEXT) $@ - -wineboot.exe$(DLLEXT): wineboot/wineboot.exe$(DLLEXT) - $(RM) $@ && $(LN_S) wineboot/wineboot.exe$(DLLEXT) $@ - -winebrowser.exe$(DLLEXT): winebrowser/winebrowser.exe$(DLLEXT) - $(RM) $@ && $(LN_S) winebrowser/winebrowser.exe$(DLLEXT) $@ - -winecfg.exe$(DLLEXT): winecfg/winecfg.exe$(DLLEXT) - $(RM) $@ && $(LN_S) winecfg/winecfg.exe$(DLLEXT) $@ - -wineconsole.exe$(DLLEXT): wineconsole/wineconsole.exe$(DLLEXT) - $(RM) $@ && $(LN_S) wineconsole/wineconsole.exe$(DLLEXT) $@ - -winedbg.exe$(DLLEXT): winedbg/winedbg.exe$(DLLEXT) - $(RM) $@ && $(LN_S) winedbg/winedbg.exe$(DLLEXT) $@ - -winefile.exe$(DLLEXT): winefile/winefile.exe$(DLLEXT) - $(RM) $@ && $(LN_S) winefile/winefile.exe$(DLLEXT) $@ - -winemenubuilder.exe$(DLLEXT): winemenubuilder/winemenubuilder.exe$(DLLEXT) - $(RM) $@ && $(LN_S) winemenubuilder/winemenubuilder.exe$(DLLEXT) $@ - -winemine.exe$(DLLEXT): winemine/winemine.exe$(DLLEXT) - $(RM) $@ && $(LN_S) winemine/winemine.exe$(DLLEXT) $@ - -winepath.exe$(DLLEXT): winepath/winepath.exe$(DLLEXT) - $(RM) $@ && $(LN_S) winepath/winepath.exe$(DLLEXT) $@ - -winetest.exe$(DLLEXT): winetest/winetest.exe$(DLLEXT) - $(RM) $@ && $(LN_S) winetest/winetest.exe$(DLLEXT) $@ - -winevdm.exe$(DLLEXT): winevdm/winevdm.exe$(DLLEXT) - $(RM) $@ && $(LN_S) winevdm/winevdm.exe$(DLLEXT) $@ - -winhelp.exe$(DLLEXT): winhelp/winhelp.exe$(DLLEXT) - $(RM) $@ && $(LN_S) winhelp/winhelp.exe$(DLLEXT) $@ - -winver.exe$(DLLEXT): winver/winver.exe$(DLLEXT) - $(RM) $@ && $(LN_S) winver/winver.exe$(DLLEXT) $@ - -wordpad.exe$(DLLEXT): wordpad/wordpad.exe$(DLLEXT) - $(RM) $@ && $(LN_S) wordpad/wordpad.exe$(DLLEXT) $@ - -avitools/aviinfo.exe$(DLLEXT): avitools -avitools/aviplay.exe$(DLLEXT): avitools -clock/clock.exe$(DLLEXT): clock -cmdlgtst/cmdlgtst.exe$(DLLEXT): cmdlgtst -control/control.exe$(DLLEXT): control -eject/eject.exe$(DLLEXT): eject -expand/expand.exe$(DLLEXT): expand -explorer/explorer.exe$(DLLEXT): explorer -hh/hh.exe$(DLLEXT): hh -avitools/icinfo.exe$(DLLEXT): avitools -msiexec/msiexec.exe$(DLLEXT): msiexec -notepad/notepad.exe$(DLLEXT): notepad -progman/progman.exe$(DLLEXT): progman -regedit/regedit.exe$(DLLEXT): regedit -regsvr32/regsvr32.exe$(DLLEXT): regsvr32 -rpcss/rpcss.exe$(DLLEXT): rpcss -rundll32/rundll32.exe$(DLLEXT): rundll32 -start/start.exe$(DLLEXT): start -taskmgr/taskmgr.exe$(DLLEXT): taskmgr -uninstaller/uninstaller.exe$(DLLEXT): uninstaller -view/view.exe$(DLLEXT): view -wcmd/wcmd.exe$(DLLEXT): wcmd -wineboot/wineboot.exe$(DLLEXT): wineboot -winebrowser/winebrowser.exe$(DLLEXT): winebrowser -winecfg/winecfg.exe$(DLLEXT): winecfg -wineconsole/wineconsole.exe$(DLLEXT): wineconsole -winedbg/winedbg.exe$(DLLEXT): winedbg -winefile/winefile.exe$(DLLEXT): winefile -winemenubuilder/winemenubuilder.exe$(DLLEXT): winemenubuilder -winemine/winemine.exe$(DLLEXT): winemine -winepath/winepath.exe$(DLLEXT): winepath -winetest/winetest.exe$(DLLEXT): winetest -winevdm/winevdm.exe$(DLLEXT): winevdm -winhelp/winhelp.exe$(DLLEXT): winhelp -winver/winver.exe$(DLLEXT): winver -wordpad/wordpad.exe$(DLLEXT): wordpad - ### Dependencies: diff --git a/programs/make_progs b/programs/make_progs index 76c8a2e..ee871bf 100755 --- a/programs/make_progs +++ b/programs/make_progs @@ -76,6 +76,7 @@ foreach my $i (split(/\s/,$makefiles)) $module = $1; next if ($module eq "none"); ($directories{$module} = $i) =~ s/^\.\/(.*)\/[^\/]+$/$1/; + die "invalid module $module in dir $directories{$module}\n" if "$directories{$module}.exe" ne $module; last; } if (/^PROGRAMS\s*=((\s*[a-zA-Z0-9_.]+)+)/) @@ -133,12 +134,6 @@ foreach my $dir (sort keys %alldirs) printf NEWMAKE " \\\n\t%s", $dir if $bin_install{$dir}; } -print NEWMAKE "\n\n# Symlinks to apps that we want to run from inside the source tree\nSYMLINKS ="; -foreach my $mod (sort keys %directories) -{ - printf NEWMAKE " \\\n\t%s\$(DLLEXT)", $mod; -} - ################################################################ # output the build and install targets @@ -147,7 +142,7 @@ print NEWMAKE <<EOF; \@MAKE_RULES\@ -all: wineapploader winelauncher \$(SUBDIRS) \$(SYMLINKS) +all: wineapploader winelauncher \$(SUBDIRS) wineapploader: wineapploader.in sed -e 's,\@bindir\\\@,\$(bindir),g' \$(SRCDIR)/wineapploader.in >\$\@ || (\$(RM) \$\@ && false) @@ -180,36 +175,15 @@ uninstall:: -rmdir \$(DESTDIR)\$(dlldir) clean:: - \$(RM) wineapploader winelauncher \$(SYMLINKS) + \$(RM) wineapploader winelauncher # Rules for testing check test:: \$(SUBDIRS:%=%/__test__) +### Dependencies: EOF -################################################################ -# output the symlinks rules - -print NEWMAKE "# Rules for symlinks\n\n"; - -foreach my $mod (sort keys %directories) -{ - printf NEWMAKE "%s\$(DLLEXT)", $mod; - printf NEWMAKE ": %s/%s\$(DLLEXT)\n", $directories{$mod}, $mod; - printf NEWMAKE "\t\$(RM) \$@ && \$(LN_S) %s/%s\$(DLLEXT) \$@\n\n", $directories{$mod}, $mod; -} - -foreach my $mod (sort keys %directories) -{ - printf NEWMAKE "%s/%s\$(DLLEXT): %s\n", $directories{$mod}, $mod, $directories{$mod}; -} - -################################################################ -# makefile trailer - -print NEWMAKE "\n### Dependencies:\n"; - close NEWMAKE; rename "Makefile.in.new", "Makefile.in"; printf "Successfully updated Makefile.in\n";

1 0

Alexandre Julliard : x11drv: Clear new bitmaps if they don' t contain any data.
by Alexandre Julliard March 20, 2006

March 20, 2006

Module: wine Branch: refs/heads/master Commit: ddc60c85f6747a96c93925b2fd785d1419f17dee URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ddc60c85f6747a96c93925b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 20 16:00:34 2006 +0100 x11drv: Clear new bitmaps if they don't contain any data. --- dlls/gdi/tests/gdiobj.c | 2 -- dlls/x11drv/bitmap.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/gdi/tests/gdiobj.c b/dlls/gdi/tests/gdiobj.c index ec4d2d4..4de266c 100644 --- a/dlls/gdi/tests/gdiobj.c +++ b/dlls/gdi/tests/gdiobj.c @@ -1034,9 +1034,7 @@ static void test_bitmap(void) memset(buf, 0xAA, sizeof(buf)); ret = GetBitmapBits(hbmp, sizeof(buf), buf); ok(ret == bm.bmWidthBytes * bm.bmHeight, "%d != %d\n", ret, bm.bmWidthBytes * bm.bmHeight); -todo_wine { ok(!memcmp(buf, buf_cmp, sizeof(buf)), "buffers do not match\n"); -} hbmp_old = SelectObject(hdc, hbmp_old); ok(hbmp_old == hbmp, "wrong old bitmap %p\n", hbmp_old); diff --git a/dlls/x11drv/bitmap.c b/dlls/x11drv/bitmap.c index b2e7718..060102f 100644 --- a/dlls/x11drv/bitmap.c +++ b/dlls/x11drv/bitmap.c @@ -146,7 +146,18 @@ BOOL X11DRV_CreateBitmap( X11DRV_PDEVICE } if (bitmap.bmBits) /* Set bitmap bits */ + { X11DRV_SetBitmapBits( hbitmap, bitmap.bmBits, bitmap.bmHeight * bitmap.bmWidthBytes ); + } + else /* else clear the bitmap */ + { + wine_tsx11_lock(); + XSetFunction( gdi_display, BITMAP_GC(physBitmap), GXclear ); + XFillRectangle( gdi_display, physBitmap->pixmap, BITMAP_GC(physBitmap), 0, 0, + bitmap.bmWidth, bitmap.bmHeight ); + XSetFunction( gdi_display, BITMAP_GC(physBitmap), GXcopy ); + wine_tsx11_unlock(); + } return TRUE; }

1 0