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

Alexandre Julliard : dlls: Removed a number of dll symlinks that are no longer needed.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: 02fa42dc82993cd9ed31dfa9b231649c60f671d6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=02fa42dc82993cd9ed31dfa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 21 12:01:31 2006 +0100 dlls: Removed a number of dll symlinks that are no longer needed. --- dlls/Makefile.in | 721 +++++------------------------------------------- dlls/Maketest.rules.in | 2 dlls/make_dlls | 42 ++- 3 files changed, 98 insertions(+), 667 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=02fa42dc82993cd9ed3…

1 0

Alexandre Julliard : wine.inf: Use the new fake dlls mechanism to create placeholders for
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: d404fb5bf84206b5990516e85f48096196f8cd55 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d404fb5bf84206b5990516e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 21 11:40:11 2006 +0100 wine.inf: Use the new fake dlls mechanism to create placeholders for applications instead of using symlinks. --- tools/wine.inf | 19 +++++++++++++++++++ tools/wineprefixcreate.in | 34 ---------------------------------- 2 files changed, 19 insertions(+), 34 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 580c3bb..747eb83 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -27,6 +27,7 @@ signature="$CHICAGO$" [DefaultInstall] RegisterDlls=RegisterDllsSection +WineFakeDlls=FakeDllsSection UpdateInis=SystemIni AddReg=\ Classes,\ @@ -48,6 +49,7 @@ AddReg=\ [DefaultInstall.NT] RegisterDlls=RegisterDllsSection +WineFakeDlls=FakeDllsSection UpdateInis=SystemIni AddReg=\ Classes,\ @@ -2100,6 +2102,23 @@ HKLM,%CurrentVersion%\Telephony\Country 11,,shell32.dll,1 11,,urlmon.dll,1 +[FakeDllsSection] +10,,notepad.exe +10,,regedit.exe +10,,rundll32.exe +10,,winebrowser.exe +10,,winhelp.exe +10,,winhlp32.exe,winhelp.exe +10,command,start.exe +11,,control.exe +11,,help.exe,winhelp.exe +11,,msiexec.exe +11,,notepad.exe +11,,progman.exe +11,,regsvr32.exe +11,,wcmd.exe +11,,winver.exe + [SystemIni] system.ini, mci,,"MPEGVideo=mciqtz.drv" system.ini, mci,,"MPEGVideo2=mciqtz.drv" diff --git a/tools/wineprefixcreate.in b/tools/wineprefixcreate.in index 8a7e6d8..d716991 100644 --- a/tools/wineprefixcreate.in +++ b/tools/wineprefixcreate.in @@ -164,40 +164,6 @@ do [ -d "$i" ] || mkdir "$i" done -# Create the application symlinks - -link_app() -{ - if [ ! -f "$2" ] - then - # make a copy if the original is writable - if [ -w "$dlldir/$1.exe.so" ] - then - cp "$dlldir/$1.exe.so" "$2" || echo "Warning: failed to create $2" - else - ln -s "$dlldir/$1.exe.so" "$2" || echo "Warning: failed to create $2" - fi - fi -} - -link_app start "$CROOT/windows/command/start.exe" -link_app notepad "$CROOT/windows/notepad.exe" -link_app regedit "$CROOT/windows/regedit.exe" -link_app rundll32 "$CROOT/windows/rundll32.exe" -link_app wcmd "$CROOT/windows/system32/wcmd.exe" -link_app control "$CROOT/windows/system32/control.exe" -link_app winhelp "$CROOT/windows/system32/help.exe" -link_app msiexec "$CROOT/windows/system32/msiexec.exe" -link_app notepad "$CROOT/windows/system32/notepad.exe" -link_app progman "$CROOT/windows/system32/progman.exe" -link_app regsvr32 "$CROOT/windows/system32/regsvr32.exe" -link_app winemine "$CROOT/windows/system32/winmine.exe" -link_app winver "$CROOT/windows/system32/winver.exe" -link_app uninstaller "$CROOT/windows/uninstall.exe" -link_app winhelp "$CROOT/windows/winhelp.exe" -link_app winhelp "$CROOT/windows/winhlp32.exe" -link_app winebrowser "$CROOT/windows/winebrowser.exe" - # Copy the .inf script and run it cp "$datadir/wine.inf" "$CROOT/windows/inf/wine.inf"

1 0

Alexandre Julliard : ntdll: Detect the fake dlls created by setupapi and refuse to load them.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: 2f2819466bbc551ae37d72c7c9a759bd82d5e003 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2f2819466bbc551ae37d72c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 21 11:31:23 2006 +0100 ntdll: Detect the fake dlls created by setupapi and refuse to load them. --- dlls/ntdll/loader.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index efc2bed..967c298 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1202,6 +1202,22 @@ NTSTATUS WINAPI LdrGetProcedureAddress(H /*********************************************************************** + * is_fake_dll + * + * Check if a loaded native dll is a Wine fake dll. + */ +static BOOL is_fake_dll( const void *base ) +{ + static const char fakedll_signature[] = "Wine placeholder DLL"; + const IMAGE_DOS_HEADER *dos = base; + + if (dos->e_lfanew >= sizeof(*dos) + sizeof(fakedll_signature) && + !memcmp( dos + 1, fakedll_signature, sizeof(fakedll_signature) )) return TRUE; + return FALSE; +} + + +/*********************************************************************** * get_builtin_fullname * * Build the full pathname for a builtin dll. @@ -1371,6 +1387,13 @@ static NTSTATUS load_native_dll( LPCWSTR NtClose( mapping ); if (status != STATUS_SUCCESS) return status; + if (is_fake_dll( module )) + { + TRACE( "%s is a fake dll, not loading it\n", debugstr_w(name) ); + NtUnmapViewOfSection( NtCurrentProcess(), module ); + return STATUS_DLL_NOT_FOUND; + } + /* create the MODREF */ if (!(wm = alloc_module( module, name ))) return STATUS_NO_MEMORY;

1 0

Vitaliy Margolen : dinput: Create single thread for mouse and keyboard hook .
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: e66e34ef7b5ad61bda09067e6ea8f8990017b5de URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e66e34ef7b5ad61bda09067… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sat Mar 18 11:26:37 2006 -0700 dinput: Create single thread for mouse and keyboard hook. Put keyboard & mouse hook callbacks into separate thread. Move few global variables into object. Delete no longer used crit section. For hooks to work properly hook callback have to be in a thread with message loop. Some games create separate threads just to handle mouse and/or keyboard events that do not have message loop. --- dlls/dinput/device.c | 138 ++++++++++++++++++++++++++++++++++++++++++ dlls/dinput/device_private.h | 2 + dlls/dinput/keyboard.c | 130 +++++++++++++++------------------------- dlls/dinput/mouse.c | 33 +++------- 4 files changed, 201 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=e66e34ef7b5ad61bda0…

1 0

Alexandre Julliard : setupapi: Added support for creating fake dlls at install time.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: 8b478a70ec7362249c8075d75812f1175c956f39 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8b478a70ec7362249c8075d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 21 11:30:48 2006 +0100 setupapi: Added support for creating fake dlls at install time. This should satisfy applications that access a dll file directly. For apps that check the dll version in the file, the version resource is copied from the builtin dll. --- dlls/setupapi/Makefile.in | 1 dlls/setupapi/fakedll.c | 332 ++++++++++++++++++++++++++++++++++++++ dlls/setupapi/install.c | 46 +++++ dlls/setupapi/setupapi_private.h | 2 4 files changed, 381 insertions(+), 0 deletions(-) create mode 100644 dlls/setupapi/fakedll.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=8b478a70ec7362249c8…

1 0

Mike Hearn : opengl32: Optimize thunks by storing GL context in the thread environment block.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: 253a2d089c4bc5d70e24d4193402dc566800dc98 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=253a2d089c4bc5d70e24d41… Author: Mike Hearn <mike(a)plan99.net> Date: Mon Mar 20 16:55:06 2006 +0000 opengl32: Optimize thunks by storing GL context in the thread environment block. --- dlls/opengl32/Makefile.in | 2 +- dlls/opengl32/wgl.c | 27 +++++++++++++++------------ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/opengl32/Makefile.in b/dlls/opengl32/Makefile.in index aceb302..b900d17 100644 --- a/dlls/opengl32/Makefile.in +++ b/dlls/opengl32/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = opengl32.dll IMPORTLIB = libopengl32.$(IMPLIBEXT) -IMPORTS = user32 gdi32 advapi32 kernel32 +IMPORTS = user32 gdi32 advapi32 kernel32 ntdll EXTRAINCL = @X_CFLAGS@ EXTRALIBS = @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@ diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 56c8ad1..71f7511 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -31,6 +31,8 @@ #include "winerror.h" #include "winreg.h" #include "wingdi.h" +#include "winternl.h" +#include "winnt.h" #include "wgl_ext.h" #include "opengl_ext.h" @@ -82,6 +84,7 @@ typedef struct wine_glcontext { XVisualInfo *vis; GLXFBConfig fb_conf; GLXContext ctx; + BOOL do_escape; struct wine_glcontext *next; struct wine_glcontext *prev; } Wine_GLContext; @@ -96,18 +99,13 @@ static inline Wine_GLContext *get_contex void enter_gl(void) { - GLXContext gl_ctx; - Wine_GLContext *ctx; - enum x11drv_escape_codes escape = X11DRV_SYNC_PIXMAP; - - wine_tsx11_lock_ptr(); - gl_ctx = glXGetCurrentContext(); - if(!gl_ctx) return; - ctx = get_context_from_GLXContext(gl_ctx); - wine_tsx11_unlock_ptr(); /* unlock before calling GDI apis */ - - if(ctx && GetObjectType(ctx->hdc) == OBJ_MEMDC) - ExtEscape(ctx->hdc, X11DRV_ESCAPE, sizeof(escape), (LPCSTR)&escape, 0, NULL); + Wine_GLContext *curctx = (Wine_GLContext *) NtCurrentTeb()->glContext; + + if (curctx && curctx->do_escape) + { + enum x11drv_escape_codes escape = X11DRV_SYNC_PIXMAP; + ExtEscape(curctx->hdc, X11DRV_ESCAPE, sizeof(escape), (LPCSTR)&escape, 0, NULL); + } wine_tsx11_lock_ptr(); return; @@ -541,6 +539,7 @@ BOOL WINAPI wglMakeCurrent(HDC hdc, ENTER_GL(); if (hglrc == NULL) { ret = glXMakeCurrent(default_display, None, NULL); + NtCurrentTeb()->glContext = NULL; } else { Wine_GLContext *ctx = (Wine_GLContext *) hglrc; Drawable drawable = get_drawable( hdc ); @@ -571,8 +570,12 @@ BOOL WINAPI wglMakeCurrent(HDC hdc, } TRACE(" make current for dis %p, drawable %p, ctx %p\n", ctx->display, (void*) drawable, ctx->ctx); ret = glXMakeCurrent(ctx->display, drawable, ctx->ctx); + NtCurrentTeb()->glContext = ctx; if(ret && type == OBJ_MEMDC) + { + ctx->do_escape = TRUE; glDrawBuffer(GL_FRONT_LEFT); + } } LEAVE_GL(); TRACE(" returning %s\n", (ret ? "True" : "False"));

1 0

Dmitry Timoshkov : gdi: Fix a couple of todos in the bitmap test.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: e6f16250b29fbdddba7359fa68eb29df4471ad1e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e6f16250b29fbdddba7359f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Mar 21 12:00:43 2006 +0800 gdi: Fix a couple of todos in the bitmap test. --- dlls/gdi/bitmap.c | 15 +++++++-------- dlls/gdi/tests/gdiobj.c | 4 ---- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/gdi/bitmap.c b/dlls/gdi/bitmap.c index a5b249b..2a562de 100644 --- a/dlls/gdi/bitmap.c +++ b/dlls/gdi/bitmap.c @@ -653,9 +653,9 @@ static INT BITMAP_GetObject16( HGDIOBJ h bmp16.bmPlanes = bmp->bitmap.bmPlanes; bmp16.bmBitsPixel = bmp->bitmap.bmBitsPixel; bmp16.bmBits = (SEGPTR)0; - if (count > sizeof(bmp16)) count = sizeof(bmp16); - memcpy( buffer, &bmp16, count ); - return count; + if (count < sizeof(bmp16)) return 0; + memcpy( buffer, &bmp16, sizeof(bmp16) ); + return sizeof(bmp16); } } @@ -685,11 +685,10 @@ static INT BITMAP_GetObject( HGDIOBJ han } else { - if( !buffer ) - return sizeof(BITMAP); - if (count > sizeof(BITMAP)) count = sizeof(BITMAP); - memcpy( buffer, &bmp->bitmap, count ); - return count; + if( !buffer ) return sizeof(BITMAP); + if (count < sizeof(BITMAP)) return 0; + memcpy( buffer, &bmp->bitmap, sizeof(BITMAP) ); + return sizeof(BITMAP); } } diff --git a/dlls/gdi/tests/gdiobj.c b/dlls/gdi/tests/gdiobj.c index 4de266c..35b19a3 100644 --- a/dlls/gdi/tests/gdiobj.c +++ b/dlls/gdi/tests/gdiobj.c @@ -1044,17 +1044,13 @@ static void test_bitmap(void) ok(ret == sizeof(bm), "%d != %d\n", ret, sizeof(bm)); ret = GetObject(hbmp, sizeof(bm) / 2, &bm); -todo_wine { ok(ret == 0, "%d != 0\n", ret); -} ret = GetObject(hbmp, 0, &bm); ok(ret == 0, "%d != 0\n", ret); ret = GetObject(hbmp, 1, &bm); -todo_wine { ok(ret == 0, "%d != 0\n", ret); -} DeleteObject(hbmp); DeleteDC(hdc);

1 0

Mike McCormack : taskmgr: Fix some gcc 4.1 warnings caused by commctrl. h macros.
by Alexandre Julliard 21 Mar '06

21 Mar '06

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 : taskmgr: Make some functions static.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: 25564f9f3c02c212898bb3ed60690327e5076b9b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=25564f9f3c02c212898bb3e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Mar 21 13:55:48 2006 +0900 taskmgr: Make some functions static. --- programs/taskmgr/applpage.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index 2f0f0e5..105f1df 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -48,14 +48,14 @@ static int nApplicationPageWidth; static int nApplicationPageHeight; static HANDLE hApplicationPageEvent = NULL; /* When this event becomes signaled then we refresh the app list */ static BOOL bSortAscending = TRUE; -DWORD WINAPI ApplicationPageRefreshThread(void *lpParameter); -BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam); -void AddOrUpdateHwnd(HWND hWnd, TCHAR *szTitle, HICON hIcon, BOOL bHung); -void ApplicationPageUpdate(void); -void ApplicationPageOnNotify(WPARAM wParam, LPARAM lParam); -void ApplicationPageShowContextMenu1(void); -void ApplicationPageShowContextMenu2(void); -int CALLBACK ApplicationPageCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort); +static DWORD WINAPI ApplicationPageRefreshThread(void *lpParameter); +static BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam); +static void AddOrUpdateHwnd(HWND hWnd, TCHAR *szTitle, HICON hIcon, BOOL bHung); +static void ApplicationPageUpdate(void); +static void ApplicationPageOnNotify(WPARAM wParam, LPARAM lParam); +static void ApplicationPageShowContextMenu1(void); +static void ApplicationPageShowContextMenu2(void); +static int CALLBACK ApplicationPageCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort); #if 0 void SwitchToThisWindow ( @@ -221,7 +221,7 @@ void UpdateApplicationListControlViewSet RefreshApplicationPage(); } -DWORD WINAPI ApplicationPageRefreshThread(void *lpParameter) +static DWORD WINAPI ApplicationPageRefreshThread(void *lpParameter) { /* Create the event */ hApplicationPageEvent = CreateEvent(NULL, TRUE, TRUE, NULL); @@ -257,7 +257,7 @@ DWORD WINAPI ApplicationPageRefreshThrea } } -BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam) +static BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam) { HICON hIcon; TCHAR szText[260]; @@ -312,7 +312,7 @@ BOOL CALLBACK EnumWindowsProc(HWND hWnd, return TRUE; } -void AddOrUpdateHwnd(HWND hWnd, TCHAR *szTitle, HICON hIcon, BOOL bHung) +static void AddOrUpdateHwnd(HWND hWnd, TCHAR *szTitle, HICON hIcon, BOOL bHung) { LPAPPLICATION_PAGE_LIST_ITEM pAPLI = NULL; HIMAGELIST hImageListLarge; @@ -434,7 +434,7 @@ void AddOrUpdateHwnd(HWND hWnd, TCHAR *s ApplicationPageUpdate(); } -void ApplicationPageUpdate(void) +static void ApplicationPageUpdate(void) { /* Enable or disable the "End Task" & "Switch To" buttons */ if (ListView_GetSelectedCount(hApplicationPageListCtrl)) @@ -491,7 +491,7 @@ void ApplicationPageUpdate(void) } } -void ApplicationPageOnNotify(WPARAM wParam, LPARAM lParam) +static void ApplicationPageOnNotify(WPARAM wParam, LPARAM lParam) { int idctrl; LPNMHDR pnmh; @@ -579,7 +579,7 @@ void ApplicationPageOnNotify(WPARAM wPar } -void ApplicationPageShowContextMenu1(void) +static void ApplicationPageShowContextMenu1(void) { HMENU hMenu; HMENU hSubMenu; @@ -602,7 +602,7 @@ void ApplicationPageShowContextMenu1(voi DestroyMenu(hMenu); } -void ApplicationPageShowContextMenu2(void) +static void ApplicationPageShowContextMenu2(void) { HMENU hMenu; HMENU hSubMenu; @@ -945,7 +945,7 @@ void ApplicationPage_OnGotoProcess(void) } } -int CALLBACK ApplicationPageCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort) +static int CALLBACK ApplicationPageCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort) { LPAPPLICATION_PAGE_LIST_ITEM Param1; LPAPPLICATION_PAGE_LIST_ITEM Param2;

1 0

Byeong-Sik Jeon : winecfg: Updated Korean translation.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: 97e40ad795ecbdbfabcf93f8342f4e1cd4c5a630 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=97e40ad795ecbdbfabcf93f… Author: Byeong-Sik Jeon <wjsqudtlr(a)gmail.com> Date: Tue Mar 21 11:44:15 2006 +0900 winecfg: Updated Korean translation. --- programs/winecfg/Ko.rc | 140 ++++++++++++++++++++++++------------------------ 1 files changed, 70 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=97e40ad795ecbdbfabc…

1 0