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

Alexandre Julliard : winewrapper: Remove explicit call to wineprefixcreate.
by Alexandre Julliard March 21, 2006

March 21, 2006

Module: wine Branch: refs/heads/master Commit: d6df0ac71710cb3a1cd3b54964373eddbe1a9af0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d6df0ac71710cb3a1cd3b54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 21 12:01:12 2006 +0100 winewrapper: Remove explicit call to wineprefixcreate. Now that wineprefixcreate detects the build tree automatically, the standard behavior of starting it from ntdll should work fine. --- tools/winewrapper | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/tools/winewrapper b/tools/winewrapper index c958b60..7c49b38 100755 --- a/tools/winewrapper +++ b/tools/winewrapper @@ -97,13 +97,6 @@ then . $topdir/.winewrapper fi -# create prefix directory if needed - -if [ -z "$WINEPREFIX" -a ! -d "$HOME/.wine" ] -then - "$topdir/tools/wineprefixcreate" --use-wine-tree "$topdir" -fi - # and run the application case "$0" in

1 0

Alexandre Julliard : wine.inf: Use the new fake dlls mechanism to create placeholders for
by Alexandre Julliard March 21, 2006

March 21, 2006

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 March 21, 2006

March 21, 2006

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

Alexandre Julliard : setupapi: Added support for creating fake dlls at install time.
by Alexandre Julliard March 21, 2006

March 21, 2006

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

Vitaliy Margolen : dinput: Create single thread for mouse and keyboard hook .
by Alexandre Julliard March 21, 2006

March 21, 2006

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

Mike Hearn : opengl32: Optimize thunks by storing GL context in the thread environment block.
by Alexandre Julliard March 21, 2006

March 21, 2006

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 March 21, 2006

March 21, 2006

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

Byeong-Sik Jeon : commdlg: Updated Korean translation.
by Alexandre Julliard March 21, 2006

March 21, 2006

Module: wine Branch: refs/heads/master Commit: 5df3e5725433598785c962b4674f613dac0a1a6b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5df3e5725433598785c962b… Author: Byeong-Sik Jeon <wjsqudtlr(a)gmail.com> Date: Tue Mar 21 11:45:58 2006 +0900 commdlg: Updated Korean translation. --- dlls/commdlg/cdlg_Ko.rc | 53 ++++++++++++++++++++++++----------------------- 1 files changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/commdlg/cdlg_Ko.rc b/dlls/commdlg/cdlg_Ko.rc index 4f86179..db2c2df 100644 --- a/dlls/commdlg/cdlg_Ko.rc +++ b/dlls/commdlg/cdlg_Ko.rc @@ -1,6 +1,7 @@ /* * Copyright 1996 Bang Jun Young - * Copyright 2005 YunSong Hwang + * Copyright 2005,2006 YunSong Hwang + * Copyright 2006 Byeong-Sik Jeon * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,7 +27,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "��" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" { LTEXT "�� ̸�(&N):", 1090, 6, 6, 76, 9 EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP @@ -48,7 +49,7 @@ FONT 8, "MS Shell Dlg" SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "�ٸ� �̸�� ..." -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" { LTEXT "�� ̸�(&N):", 1090, 6, 6, 76, 9 EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP @@ -70,7 +71,7 @@ FONT 8, "MS Shell Dlg" PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "�μ�" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" { LTEXT "��:", 1088, 6, 6, 40, 9 LTEXT "", 1089, 60, 6, 150, 9 @@ -93,7 +94,7 @@ FONT 8, "MS Shell Dlg" PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "�μ� ��" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" { GROUPBOX "��", grp1, 6, 10, 180, 65, BS_GROUPBOX RADIOBUTTON "�⺻ ��(&D)", rad1, 16, 20, 80, 12 @@ -119,9 +120,9 @@ FONT 8, "MS Shell Dlg" CHOOSE_FONT DIALOG DISCARDABLE 13, 54, 264, 147 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "�۲�" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" { - LTEXT "��(&F):",stc1 ,6,3,40,9 + LTEXT "�۲�(&F):",stc1 ,6,3,40,9 COMBOBOX cmb1, 6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE LTEXT "�۲� ��Ÿ��(&y):",stc2 ,108,3,44,9 @@ -151,7 +152,7 @@ FONT 8, "MS Shell Dlg" CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "��" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" { LTEXT "�⺻ ��(&B):", 1088, 4, 4, 140, 10 LTEXT "�� (&C):", 1089, 4, 106, 140, 10 @@ -185,15 +186,15 @@ FONT 8, "MS Shell Dlg" FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "ã��" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" { - LTEXT "ã�� (&n):", -1, 4, 8, 42, 8 + LTEXT "ã�� (&n):", -1, 4, 8, 42, 8 EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "�� ġ�ϴ� �ܾ(&W)", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "�κ�� ġ�ϴ� �ܾ�(&C)", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "�ܾ� ��(&W)", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "��/�ҹ�� (&C)", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "��", grp1, 107, 26, 68, 28 - CONTROL "��(&U)", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 - CONTROL "�Ʒ�(&D)", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 + CONTROL "��(&U)", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 + CONTROL "�Ʒ��(&D)", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 DEFPUSHBUTTON "�� ã��(&F)", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "��", IDCANCEL , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP @@ -204,14 +205,14 @@ FONT 8, "MS Shell Dlg" REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "�ٲٱ�" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" { - LTEXT "ã�� (&n):", -1, 4, 9, 48, 8 + LTEXT "ã�� (&n):", -1, 4, 9, 48, 8 EDITTEXT edt1, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "�ٲ� ��(&p):", -1, 4, 26, 48, 8 + LTEXT "�ٲ� ��(&p):", -1, 4, 26, 48, 8 EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "�� ġ�ϴ� �ܾ(&W)", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "�κ�� ġ�ϴ� ��(&C)", chx2, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "�ܾ� ��(&W)", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "��/�ҹ�� (&C)", chx2, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP DEFPUSHBUTTON "�� ã��(&F)", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "�ٲٱ�(&R)", psh1 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP @@ -225,7 +226,7 @@ PRINT32 DIALOG LOADONCALL MOVEABLE DISCA STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK CAPTION "�μ�" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" { DEFPUSHBUTTON "Ȯ��", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON PUSHBUTTON "��", IDCANCEL, 232,164, 48,14, WS_GROUP @@ -240,7 +241,7 @@ FONT 8, "MS Shell Dlg" LTEXT "�� ", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "��:", stc7, 16, 48, 36,10, SS_NOPREFIX LTEXT "�� ", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "��𿡼�?:", stc10, 16, 60, 36,10, SS_NOPREFIX + LTEXT "��ġ:", stc10, 16, 60, 36,10, SS_NOPREFIX LTEXT "�� ġ", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "��:", stc9, 16, 72, 36,10, SS_NOPREFIX LTEXT "�� ", stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP @@ -265,7 +266,7 @@ PRINT32_SETUP DIALOG LOADONCALL MOVEABLE STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK CAPTION "�� " -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Ȯ��",IDOK,180,156,48,14,WS_GROUP PUSHBUTTON "��",IDCANCEL,232,156,48,14 @@ -279,8 +280,8 @@ BEGIN LTEXT "�� ", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "��:", stc7, 16, 48, 36,10, SS_NOPREFIX LTEXT "�� ", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "��𿡼�:", stc10, 16, 60, 36,10, SS_NOPREFIX - LTEXT "�� ġ", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "��ġ:", stc10, 16, 60, 36,10, SS_NOPREFIX + LTEXT "�� ġ", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "��:", stc9, 16, 72, 36,10, SS_NOPREFIX LTEXT "�� ", stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP @@ -299,7 +300,7 @@ END PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "�� " -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 @@ -329,7 +330,7 @@ END NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN CAPTION "��" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" { LTEXT "��(&i):",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP

1 0

Byeong-Sik Jeon : winecfg: Updated Korean translation.
by Alexandre Julliard March 21, 2006

March 21, 2006

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

Mike McCormack : taskmgr: Make some functions static.
by Alexandre Julliard March 21, 2006

March 21, 2006

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