March 2006 - wine-commits

Mike McCormack : msi: Implement custom action type 17.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: cf4f79e87739e6ced68d023228c7f0e62d3e98ce URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cf4f79e87739e6ced68d023… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 22 13:42:52 2006 +0900 msi: Implement custom action type 17. --- dlls/msi/custom.c | 56 +++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 43 insertions(+), 13 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 2ed4b81..bab2a4e 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -67,6 +67,8 @@ static UINT HANDLE_CustomType1(MSIPACKAG LPCWSTR target, const INT type, LPCWSTR action); static UINT HANDLE_CustomType2(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action); +static UINT HANDLE_CustomType17(MSIPACKAGE *package, LPCWSTR source, + LPCWSTR target, const INT type, LPCWSTR action); static UINT HANDLE_CustomType18(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action); static UINT HANDLE_CustomType19(MSIPACKAGE *package, LPCWSTR source, @@ -207,6 +209,9 @@ UINT ACTION_CustomAction(MSIPACKAGE *pac case 19: /* Error that halts install */ rc = HANDLE_CustomType19(package,source,target,type,action); break; + case 17: + rc = HANDLE_CustomType17(package,source,target,type,action); + break; case 50: /*EXE file specified by a property value */ rc = HANDLE_CustomType50(package,source,target,type,action); break; @@ -437,13 +442,13 @@ static DWORD WINAPI ACTION_CallDllFuncti ERR("Handle for object %p not found\n", package ); } else - ERR("Cannot load functon\n"); + ERR("failed to resolve functon %s\n", debugstr_a(proc)); msi_free(proc); FreeLibrary(hModule); } else - ERR("Unable to load library\n"); + ERR("failed to load dll %s\n", debugstr_w(stuff->source)); msiobj_release( &stuff->package->hdr ); msi_free(stuff->source); msi_free(stuff->target); @@ -468,15 +473,26 @@ static DWORD WINAPI DllThread(LPVOID inf return rc; } +static HANDLE do_msidbCustomActionTypeDll(MSIPACKAGE *package, LPCWSTR dll, LPCWSTR target) +{ + thread_struct *info; + + info = msi_alloc( sizeof(*info) ); + msiobj_addref( &package->hdr ); + info->package = package; + info->target = strdupW(target); + info->source = strdupW(dll); + + return CreateThread(NULL, 0, DllThread, info, 0, NULL); +} + static UINT HANDLE_CustomType1(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action) { WCHAR tmp_file[MAX_PATH]; - thread_struct *info; - DWORD ThreadId; - HANDLE ThreadHandle; UINT rc = ERROR_SUCCESS; BOOL finished = FALSE; + HANDLE ThreadHandle; store_binary_to_temp(package, source, tmp_file); @@ -489,13 +505,7 @@ static UINT HANDLE_CustomType1(MSIPACKAG strcatW(tmp_file,dot); } - info = msi_alloc( sizeof(*info) ); - msiobj_addref( &package->hdr ); - info->package = package; - info->target = strdupW(target); - info->source = strdupW(tmp_file); - - ThreadHandle = CreateThread(NULL,0,DllThread,(LPVOID)info,0,&ThreadId); + ThreadHandle = do_msidbCustomActionTypeDll( package, tmp_file, target ); rc = process_handle(package, type, ThreadHandle, NULL, action, &finished ); @@ -503,7 +513,7 @@ static UINT HANDLE_CustomType1(MSIPACKAG track_tempfile(package, tmp_file, tmp_file); else DeleteFileW(tmp_file); - + return rc; } @@ -568,6 +578,26 @@ static UINT HANDLE_CustomType2(MSIPACKAG return prc; } +static UINT HANDLE_CustomType17(MSIPACKAGE *package, LPCWSTR source, + LPCWSTR target, const INT type, LPCWSTR action) +{ + HANDLE hThread; + MSIFILE *file; + + TRACE("%s %s\n", debugstr_w(source), debugstr_w(target)); + + file = get_loaded_file( package, source ); + if (!file) + { + ERR("invalid file key %s\n", debugstr_w( source )); + return ERROR_FUNCTION_FAILED; + } + + hThread = do_msidbCustomActionTypeDll( package, file->TargetPath, target ); + + return process_handle(package, type, hThread, NULL, action, NULL ); +} + static UINT HANDLE_CustomType18(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action) {

1 0

Mike McCormack : riched20: Add a version resource.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: fedd5250e362421c5df5edf7d8a9056f5613e199 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fedd5250e362421c5df5edf… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 22 13:46:20 2006 +0900 riched20: Add a version resource. --- dlls/riched20/.gitignore | 1 + dlls/riched20/Makefile.in | 2 ++ dlls/riched20/version.rc | 26 ++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 0 deletions(-) create mode 100644 dlls/riched20/version.rc diff --git a/dlls/riched20/.gitignore b/dlls/riched20/.gitignore index aa58e05..d74aa87 100644 --- a/dlls/riched20/.gitignore +++ b/dlls/riched20/.gitignore @@ -1,2 +1,3 @@ Makefile libriched20.def +version.res diff --git a/dlls/riched20/Makefile.in b/dlls/riched20/Makefile.in index c4deaf8..b089f89 100644 --- a/dlls/riched20/Makefile.in +++ b/dlls/riched20/Makefile.in @@ -28,6 +28,8 @@ C_SRCS = \ SUBDIRS = tests +RC_SRCS = version.rc + @MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/riched20/version.rc b/dlls/riched20/version.rc new file mode 100644 index 0000000..bc907c9 --- /dev/null +++ b/dlls/riched20/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2006 Mike McCormack + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Richedit dll" +#define WINE_FILENAME_STR "riched20.dll" +#define WINE_FILEVERSION 5,30,23,1215 +#define WINE_FILEVERSION_STR "5,30,23,1215" +#define WINE_PRODUCTVERSION 5,30,23,1215 +#define WINE_PRODUCTVERSION_STR "5,30,23,1215" + +#include "wine/wine_common_ver.rc"

1 0

Mike McCormack : wintrust: Use the definition of WINTRUST_ACTION_GENERIC_VERIFY_V2 in softpub.h.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: ee069f24ba2182a7447044834b4c08c1a8eea601 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ee069f24ba2182a74470448… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 22 13:46:02 2006 +0900 wintrust: Use the definition of WINTRUST_ACTION_GENERIC_VERIFY_V2 in softpub.h. --- dlls/wintrust/wintrust_main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 09ddfed..044722c 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -25,6 +25,7 @@ #include "winerror.h" #include "guiddef.h" #include "wintrust.h" +#include "softpub.h" #include "mscat.h" #include "objbase.h" @@ -86,8 +87,7 @@ BOOL WINAPI CryptCATAdminReleaseContext( */ LONG WINAPI WinVerifyTrust( HWND hwnd, GUID *ActionID, WINTRUST_DATA* ActionData ) { - static const GUID WINTRUST_ACTION_GENERIC_VERIFY_V2 = { 0xaac56b, 0xcd44, 0x11d0, - { 0x8c,0xc2,0x00,0xc0,0x4f,0xc2,0x95,0xee }}; + static const GUID gen_verify_v2 = WINTRUST_ACTION_GENERIC_VERIFY_V2; FIXME("%p %s %p\n", hwnd, debugstr_guid(ActionID), ActionData); @@ -104,7 +104,7 @@ LONG WINAPI WinVerifyTrust( HWND hwnd, G * */ - if (IsEqualCLSID(ActionID, &WINTRUST_ACTION_GENERIC_VERIFY_V2)) + if (IsEqualCLSID(ActionID, &gen_verify_v2)) return TRUST_E_PROVIDER_UNKNOWN; return ERROR_SUCCESS;

1 0

Mike McCormack : include: Add softpub.h.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: cfef0fee01f19dd1117d1bf794eb6eddf6157fd1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cfef0fee01f19dd1117d1bf… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 22 13:45:35 2006 +0900 include: Add softpub.h. --- include/Makefile.in | 1 + include/softpub.h | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) create mode 100644 include/softpub.h diff --git a/include/Makefile.in b/include/Makefile.in index 033ad99..c40e5f9 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -244,6 +244,7 @@ WINDOWS_INCLUDES = \ shlwapi.h \ sipbase.h \ snmp.h \ + softpub.h \ sql.h \ sqlext.h \ sqltypes.h \ diff --git a/include/softpub.h b/include/softpub.h new file mode 100644 index 0000000..b5836b0 --- /dev/null +++ b/include/softpub.h @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2006 Mike McCormack + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __WINE_SOFTPUB_H +#define __WINE_SOFTPUB_H + +#include <wintrust.h> + +#define WINTRUST_ACTION_GENERIC_CERT_VERIFY \ + { 0x189a3842, 0x3041, 0x11d1, { 0x85,0xe1,0x00,0xc0,0x4f,0xc2,0x95,0xee }} + +#define WINTRUST_ACTION_GENERIC_CHAIN_VERIFY \ + { 0xfc451c16, 0xac75, 0x11d1, { 0xb4,0xb8,0x00,0xc0,0x4f,0xb6,0x6e,0xa0 }} + +#define WINTRUST_ACTION_GENERIC_VERIFY_V2 \ + { 0xaac56b, 0xcd44, 0x11d0, { 0x8c,0xc2,0x00,0xc0,0x4f,0xc2,0x95,0xee }} +#define WINTRUST_ACTION_TRUSTPROVIDER_TEST \ + { 0x573e31f8, 0xddba, 0x11d0, { 0x8c,0xcb,0x00,0xc0,0x4f,0xc2,0x95,0xee }} + +#endif /* __WINE_SOFTPUB_H */

1 0

Kevin Koltzau : ole32: Initial tests for OLE clipboard functions.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: 0c2d2772863e05ec5a1a77b20ecd8355f9dd0384 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0c2d2772863e05ec5a1a77b… Author: Kevin Koltzau <kevin(a)plop.org> Date: Wed Mar 22 00:05:14 2006 -0500 ole32: Initial tests for OLE clipboard functions. --- dlls/ole32/tests/.gitignore | 1 dlls/ole32/tests/Makefile.in | 1 dlls/ole32/tests/clipboard.c | 357 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 359 insertions(+), 0 deletions(-) create mode 100644 dlls/ole32/tests/clipboard.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=0c2d2772863e05ec5a1…

1 0

Bryan Mayland : kernel: WaitForMultipleObjectsEx should accept up to MAXIMUM_WAIT_OBJECTS.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: 98fd541de84c71496e773f3990ae1a139feb2e18 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=98fd541de84c71496e773f3… Author: Bryan Mayland <bmayland(a)leoninedev.com> Date: Tue Mar 21 16:45:40 2006 -0500 kernel: WaitForMultipleObjectsEx should accept up to MAXIMUM_WAIT_OBJECTS. --- dlls/kernel/sync.c | 2 +- dlls/kernel/tests/sync.c | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/kernel/sync.c b/dlls/kernel/sync.c index 5a2535e..cec44f5 100644 --- a/dlls/kernel/sync.c +++ b/dlls/kernel/sync.c @@ -173,7 +173,7 @@ DWORD WINAPI WaitForMultipleObjectsEx( D HANDLE hloc[MAXIMUM_WAIT_OBJECTS]; unsigned int i; - if (count >= MAXIMUM_WAIT_OBJECTS) + if (count > MAXIMUM_WAIT_OBJECTS) { SetLastError(ERROR_INVALID_PARAMETER); return WAIT_FAILED; diff --git a/dlls/kernel/tests/sync.c b/dlls/kernel/tests/sync.c index 6d7bc88..a7f6408 100644 --- a/dlls/kernel/tests/sync.c +++ b/dlls/kernel/tests/sync.c @@ -31,7 +31,8 @@ static void test_signalandwait(void) DWORD (WINAPI *pSignalObjectAndWait)(HANDLE, HANDLE, DWORD, BOOL); HMODULE kernel32; DWORD r; - HANDLE event[2], semaphore[2], file; + int i; + HANDLE event[2], maxevents[MAXIMUM_WAIT_OBJECTS], semaphore[2], file; kernel32 = GetModuleHandle("kernel32"); pSignalObjectAndWait = (void*) GetProcAddress(kernel32, "SignalObjectAndWait"); @@ -83,6 +84,18 @@ static void test_signalandwait(void) CloseHandle(event[0]); CloseHandle(event[1]); + /* create the maximum number of events and make sure + * we can wait on that many */ + for (i=0; i<MAXIMUM_WAIT_OBJECTS; i++) + { + maxevents[i] = CreateEvent(NULL, 1, 1, NULL); + ok( maxevents[i] != 0, "should create enough events\n"); + } + r = WaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, 0, 0); + ok( r != WAIT_FAILED && r != WAIT_TIMEOUT, "should succeed\n"); + + for (i=0; i<MAXIMUM_WAIT_OBJECTS; i++) + if (maxevents[i]) CloseHandle(maxevents[i]); /* semaphores */ semaphore[0] = CreateSemaphore( NULL, 0, 1, NULL );

1 0

Lei Zhang : riched20: Implements FR_WHOLEWORD for EM_FINDTEXT.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: b4ee2ad0e4210861df16c30062cbb6af9b406914 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b4ee2ad0e4210861df16c30… Author: Lei Zhang <leiz(a)ucla.edu> Date: Tue Mar 21 03:43:56 2006 -0800 riched20: Implements FR_WHOLEWORD for EM_FINDTEXT. Add FR_WHOLEWORD to riched20's EM_FINDTEXT and fix a couple small bugs introduced in earlier patches for EM_FINDTEXT. Additional test cases have been added to check for corner cases. Also improve input validation. --- dlls/riched20/editor.c | 125 ++++++++++++++++++++++++++++++++++++++---- dlls/riched20/tests/editor.c | 10 +++ 2 files changed, 121 insertions(+), 14 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 506c706..bcb2a5c 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -764,34 +764,38 @@ ME_FindItemAtOffset(ME_TextEditor *edito static int ME_FindText(ME_TextEditor *editor, DWORD flags, CHARRANGE *chrg, WCHAR *text, CHARRANGE *chrgText) { + const int nLen = lstrlenW(text); + const int nTextLen = ME_GetTextLength(editor); int nStart, nEnd; - int nLen = lstrlenW(text); int nMin, nMax; ME_DisplayItem *item; ME_DisplayItem *para; + WCHAR wLastChar = ' '; TRACE("flags==0x%08lx, chrg->cpMin==%ld, chrg->cpMax==%ld text==%s\n", flags, chrg->cpMin, chrg->cpMax, debugstr_w(text)); - if (flags & ~(FR_DOWN | FR_MATCHCASE)) - FIXME("Flags 0x%08lx not implemented\n", flags & ~(FR_DOWN | FR_MATCHCASE)); + if (flags & ~(FR_DOWN | FR_MATCHCASE | FR_WHOLEWORD)) + FIXME("Flags 0x%08lx not implemented\n", + flags & ~(FR_DOWN | FR_MATCHCASE | FR_WHOLEWORD)); nMin = chrg->cpMin; if (chrg->cpMax == -1) - nMax = ME_GetTextLength(editor); + nMax = nTextLen; else - nMax = chrg->cpMax; + nMax = chrg->cpMax > nTextLen ? nTextLen : chrg->cpMax; /* when searching up, if cpMin < cpMax, then instead of searching * on [cpMin,cpMax], we search on [0,cpMin], otherwise, search on - * [cpMax, cpMin] + * [cpMax, cpMin]. The exception is when cpMax is -1, in which + * case, it is always bigger than cpMin. */ if (!(flags & FR_DOWN)) { int nSwap = nMax; - nMax = nMin; - if (nMin < nSwap) + nMax = nMin > nTextLen ? nTextLen : nMin; + if (nMin < nSwap || chrg->cpMax == -1) nMin = 0; else nMin = nSwap; @@ -806,6 +810,20 @@ ME_FindText(ME_TextEditor *editor, DWORD if (flags & FR_DOWN) /* Forward search */ { + /* If possible, find the character before where the search starts */ + if ((flags & FR_WHOLEWORD) && nMin) + { + nStart = nMin - 1; + item = ME_FindItemAtOffset(editor, diRun, nStart, &nStart); + if (!item) + { + if (chrgText) + chrgText->cpMin = chrgText->cpMax = -1; + return -1; + } + wLastChar = item->member.run.strText->szData[nStart]; + } + nStart = nMin; item = ME_FindItemAtOffset(editor, diRun, nStart, &nStart); if (!item) @@ -825,10 +843,35 @@ ME_FindText(ME_TextEditor *editor, DWORD while (pCurItem && ME_CharCompare(pCurItem->member.run.strText->szData[nCurStart + nMatched], text[nMatched], (flags & FR_MATCHCASE))) { + if ((flags & FR_WHOLEWORD) && isalnumW(wLastChar)) + break; + nMatched++; if (nMatched == nLen) { - nStart += para->member.para.nCharOfs + item->member.run.nCharOfs; + ME_DisplayItem *pNextItem = pCurItem; + int nNextStart = nCurStart; + WCHAR wNextChar; + + /* Check to see if next character is a whitespace */ + if (flags & FR_WHOLEWORD) + { + if (nCurStart + nMatched == ME_StrLen(pCurItem->member.run.strText)) + { + pNextItem = ME_FindItemFwd(pCurItem, diRun); + nNextStart = -nMatched; + } + + if (pNextItem) + wNextChar = pNextItem->member.run.strText->szData[nNextStart + nMatched]; + else + wNextChar = ' '; + + if (isalnumW(wNextChar)) + break; + } + + nStart += para->member.para.nCharOfs + pCurItem->member.run.nCharOfs; if (chrgText) { chrgText->cpMin = nStart; @@ -844,6 +887,11 @@ ME_FindText(ME_TextEditor *editor, DWORD nCurStart = -nMatched; } } + if (pCurItem) + wLastChar = pCurItem->member.run.strText->szData[nCurStart + nMatched]; + else + wLastChar = ' '; + nStart++; if (nStart == ME_StrLen(item->member.run.strText)) { @@ -855,9 +903,24 @@ ME_FindText(ME_TextEditor *editor, DWORD } else /* Backward search */ { + /* If possible, find the character after where the search ends */ + if ((flags & FR_WHOLEWORD) && nMax < nTextLen - 1) + { + nEnd = nMax + 1; + item = ME_FindItemAtOffset(editor, diRun, nEnd, &nEnd); + if (!item) + { + if (chrgText) + chrgText->cpMin = chrgText->cpMax = -1; + return -1; + } + wLastChar = item->member.run.strText->szData[nEnd]; + } + nEnd = nMax; item = ME_FindItemAtOffset(editor, diRun, nEnd, &nEnd); - if (!item) { + if (!item) + { if (chrgText) chrgText->cpMin = chrgText->cpMax = -1; return -1; @@ -872,12 +935,45 @@ ME_FindText(ME_TextEditor *editor, DWORD int nCurEnd = nEnd; int nMatched = 0; - while (ME_CharCompare(pCurItem->member.run.strText->szData[nCurEnd - nMatched - 1], text[nLen - nMatched - 1], (flags & FR_MATCHCASE))) + if (nCurEnd - nMatched == 0) { + pCurItem = ME_FindItemBack(pCurItem, diRun); + para = ME_GetParagraph(pCurItem); + nCurEnd = ME_StrLen(pCurItem->member.run.strText) + nMatched; + } + + while (pCurItem && ME_CharCompare(pCurItem->member.run.strText->szData[nCurEnd - nMatched - 1], text[nLen - nMatched - 1], (flags & FR_MATCHCASE))) + { + if ((flags & FR_WHOLEWORD) && isalnumW(wLastChar)) + break; + nMatched++; if (nMatched == nLen) { - nStart = para->member.para.nCharOfs + item->member.run.nCharOfs + nCurEnd - nMatched; + ME_DisplayItem *pPrevItem = pCurItem; + int nPrevEnd = nCurEnd; + WCHAR wPrevChar; + + /* Check to see if previous character is a whitespace */ + if (flags & FR_WHOLEWORD) + { + if (nPrevEnd - nMatched == 0) + { + pPrevItem = ME_FindItemBack(pCurItem, diRun); + if (pPrevItem) + nPrevEnd = ME_StrLen(pPrevItem->member.run.strText) + nMatched; + } + + if (pPrevItem) + wPrevChar = pPrevItem->member.run.strText->szData[nPrevEnd - nMatched - 1]; + else + wPrevChar = ' '; + + if (isalnumW(wPrevChar)) + break; + } + + nStart = para->member.para.nCharOfs + pCurItem->member.run.nCharOfs + nCurEnd - nMatched; if (chrgText) { chrgText->cpMin = nStart; @@ -895,6 +991,11 @@ ME_FindText(ME_TextEditor *editor, DWORD nCurEnd = ME_StrLen(pCurItem->member.run.strText) + nMatched; } } + if (pCurItem) + wLastChar = pCurItem->member.run.strText->szData[nCurEnd - nMatched - 1]; + else + wLastChar = ' '; + nEnd--; if (nEnd < 0) { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 95cf705..fa5abca 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -92,10 +92,16 @@ struct find_s find_tests2[] = { {10, 5, "", 0, -1, 0}, /* Whole-word search */ - {0, -1, "wine", FR_DOWN | FR_WHOLEWORD, 18, 1}, - {0, -1, "win", FR_DOWN | FR_WHOLEWORD, -1, 1}, + {0, -1, "wine", FR_DOWN | FR_WHOLEWORD, 18, 0}, + {0, -1, "win", FR_DOWN | FR_WHOLEWORD, -1, 0}, + {13, -1, "wine", FR_DOWN | FR_WHOLEWORD, 18, 0}, + {0, -1, "winewine", FR_DOWN | FR_WHOLEWORD, 0, 0}, + {10, -1, "winewine", FR_DOWN | FR_WHOLEWORD, 23, 0}, + {11, -1, "winewine", FR_WHOLEWORD, 0, 0}, + {31, -1, "winewine", FR_WHOLEWORD, 23, 0}, /* Bad ranges */ + {5, 200, "XXX", FR_DOWN, -1, 0}, {-20, 20, "Wine", FR_DOWN, -1, 0}, {-20, 20, "Wine", FR_DOWN, -1, 0}, {-15, -20, "Wine", FR_DOWN, -1, 0},

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: 6bddeb1cf7c1e5db803c14f9d4fd1e0d1be4971e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6bddeb1cf7c1e5db803c14f… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 21 18:24:49 2006 +0100 Assorted spelling fixes. --- dlls/ddraw/tests/ddrawmodes.c | 4 ++-- dlls/ole32/datacache.c | 14 +++++++------- dlls/ole32/storage32.c | 24 ++++++++++++------------ dlls/oleaut32/dispatch.c | 18 +++++++++--------- dlls/shell32/shlfolder.c | 10 +++++----- dlls/shlwapi/ordinal.c | 2 +- dlls/shlwapi/path.c | 2 +- dlls/wininet/gopher.c | 2 +- 8 files changed, 38 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=6bddeb1cf7c1e5db803…

1 0

Francois Gouget : taskmgr: Avoid forward declarations and make functions static.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: 5c14417130de8e024fc4a4034b2bbf425d0c74a6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5c14417130de8e024fc4a40… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 21 18:35:41 2006 +0100 taskmgr: Avoid forward declarations and make functions static. --- programs/taskmgr/taskmgr.c | 1111 ++++++++++++++++++++++---------------------- programs/taskmgr/taskmgr.h | 16 - 2 files changed, 553 insertions(+), 574 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5c14417130de8e024fc…

1 0

Francois Gouget : taskmgr: Reorder functions to avoid forward declarations.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: b01a1c6f0e21f0a264083a78c58c7cc6822f0375 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b01a1c6f0e21f0a264083a7… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 21 18:34:04 2006 +0100 taskmgr: Reorder functions to avoid forward declarations. --- programs/taskmgr/applpage.c | 704 +++++++++++++++++++++---------------------- 1 files changed, 348 insertions(+), 356 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b01a1c6f0e21f0a2640…

1 0

Francois Gouget : taskmgr: Avoid forward declarations and make functions static.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: b72013d6d1d292f7d7d1dc04624f5b3984df6024 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b72013d6d1d292f7d7d1dc0… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 21 18:32:40 2006 +0100 taskmgr: Avoid forward declarations and make functions static. --- programs/taskmgr/about.c | 15 +- programs/taskmgr/affinity.c | 68 ++++---- programs/taskmgr/column.c | 245 ++++++++++++++-------------- programs/taskmgr/graph.c | 208 ++++++++++++------------ programs/taskmgr/perfpage.c | 298 +++++++++++++++++----------------- programs/taskmgr/proclist.c | 2 programs/taskmgr/procpage.c | 374 +++++++++++++++++++++---------------------- 7 files changed, 595 insertions(+), 615 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b72013d6d1d292f7d7d…

1 0

Francois Gouget : Update win32.api to match the current sources.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: 0c02e4671eedec3da3738e314c19fdb00c31c3e0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0c02e4671eedec3da3738e3… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 21 18:21:51 2006 +0100 Update win32.api to match the current sources. --- tools/winapi/win32.api | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 9edb6af..d0e5db4 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -31,6 +31,7 @@ ACCESS_MODE ACL_INFORMATION_CLASS ALG_ID BOOL +BOOLEAN BYTE DWORD HANDLE @@ -43,6 +44,7 @@ LONG LSA_HANDLE NTSTATUS POLICY_INFORMATION_CLASS +POLICY_NOTIFICATION_INFORMATION_CLASS REGSAM SC_HANDLE SC_STATUS_TYPE @@ -53,6 +55,7 @@ SECURITY_INFORMATION SERVICE_STATUS_HANDLE TOKEN_INFORMATION_CLASS TOKEN_TYPE +TRUSTED_INFORMATION_CLASS TRUSTEE_FORM TRUSTEE_TYPE UINT @@ -122,6 +125,7 @@ PLSA_OBJECT_ATTRIBUTES PLSA_REFERENCED_DOMAIN_LIST * PLSA_TRANSLATED_NAME * PLSA_TRANSLATED_SID * +PLSA_TRANSLATED_SID2 * PLSA_UNICODE_STRING PLSA_UNICODE_STRING * PLUID @@ -141,6 +145,8 @@ PSID_NAME_USE PTOKEN_GROUPS PTRACE_GUID_REGISTRATION PTRACEHANDLE +PTRUSTED_DOMAIN_AUTH_INFORMATION +PTRUSTED_DOMAIN_INFORMATION_EX PTRUSTEEA PTRUSTEEW PUCHAR @@ -202,6 +208,11 @@ STRTABLEA * LPCSTR LPSTR +%wstr + +LPCWSTR +LPWSTR + %void void @@ -631,6 +642,7 @@ HCRYPTOIDFUNCSET HLRUCACHE HLRUCACHE * LPFILETIME +LPSTR * LPVOID LPWSTR * PCCERT_CONTEXT @@ -656,6 +668,7 @@ PFN_CRYPT_ENUM_OID_INFO PVOID SIP_ADD_NEWPROVIDER * SIP_DISPATCH_INFO * +int * void * void ** @@ -1771,6 +1784,7 @@ DWORD FLAGS HRESULT INT +LHANDLE LONG SCODE UINT @@ -1821,6 +1835,7 @@ PULONG PUSHORT PVOID ULONG * +lpMapiMessage void * %str @@ -1978,6 +1993,8 @@ BOOL * ENUMPASSWORDPROC LPAUTHDLGSTRUCTA LPBYTE +LPCHANGEPWDINFOA +LPCHANGEPWDINFOW LPCONNECTDLGSTRUCTA LPCONNECTDLGSTRUCTW LPCSTR * @@ -2755,6 +2772,7 @@ PRTL_HEAP_DEFINITION PRTL_QUERY_REGISTRY_TABLE PRTL_THREAD_START_ROUTINE PRTL_USER_PROCESS_PARAMETERS +PRTL_WORK_ITEM_ROUTINE PSECURITY_DESCRIPTOR PSECURITY_DESCRIPTOR_CONTROL PSECURITY_QUALITY_OF_SERVICE @@ -2796,7 +2814,6 @@ UNICODE_STRING * USHORT * VOID * WCHAR ** -enum loadorder_type[] int * obj_handle_t * union cptable * @@ -4432,11 +4449,16 @@ DWORD HDC HRESULT LCID +UINT int %ptr +ABC * BYTE * +GOFFSET * +RECT * +SCRIPT_ANALYSIS * SCRIPT_CACHE * SCRIPT_CONTROL * SCRIPT_DIGITSUBSTITUTE * @@ -4446,6 +4468,8 @@ SCRIPT_PROPERTIES *** SCRIPT_STATE * SCRIPT_STRING_ANALYSIS * SCRIPT_TABDEF * +SCRIPT_VISATTR * +WORD * int * void * @@ -5213,16 +5237,20 @@ BOOL DWORD HANDLE HCATADMIN +HRESULT HWND LONG %ptr BYTE * +CRYPT_PROVIDER_DATA * +CRYPT_PROVIDER_SGNR * CRYPT_REGISTER_ACTIONID * DWORD * GUID * HCATADMIN * +LPVOID WINTRUST_DATA * %void

1 0

Francois Gouget : include: Add missing error and facility codes.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: 155ac7e598527f8e010e5b021262a1574b1780d6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=155ac7e598527f8e010e5b0… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 21 18:20:32 2006 +0100 include: Add missing error and facility codes. --- include/winerror.h | 57 ++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 46 insertions(+), 11 deletions(-) diff --git a/include/winerror.h b/include/winerror.h index b824c79..ef5d591 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -19,17 +19,46 @@ #ifndef __WINE_WINERROR_H #define __WINE_WINERROR_H -#define FACILITY_NULL 0 -#define FACILITY_RPC 1 -#define FACILITY_DISPATCH 2 -#define FACILITY_STORAGE 3 -#define FACILITY_ITF 4 -#define FACILITY_WIN32 7 -#define FACILITY_WINDOWS 8 -#define FACILITY_SSPI 9 -#define FACILITY_CONTROL 10 -#define FACILITY_CERT 11 -#define FACILITY_INTERNET 12 +#define FACILITY_NULL 0 +#define FACILITY_RPC 1 +#define FACILITY_DISPATCH 2 +#define FACILITY_STORAGE 3 +#define FACILITY_ITF 4 +#define FACILITY_WIN32 7 +#define FACILITY_WINDOWS 8 +#define FACILITY_SSPI 9 +#define FACILITY_SECURITY FACILITY_SSPI +#define FACILITY_CONTROL 10 +#define FACILITY_CERT 11 +#define FACILITY_INTERNET 12 +#define FACILITY_MEDIASERVER 13 +#define FACILITY_MSMQ 14 +#define FACILITY_SETUPAPI 15 +#define FACILITY_SCARD 16 +#define FACILITY_COMPLUS 17 +#define FACILITY_AAF 18 +#define FACILITY_URT 19 +#define FACILITY_ACS 20 +#define FACILITY_DPLAY 21 +#define FACILITY_UMI 22 +#define FACILITY_SXS 23 +#define FACILITY_WINDOWS_CE 24 +#define FACILITY_HTTP 25 +#define FACILITY_COMMONLOG 26 +#define FACILITY_USERMODE_FILTER_MANAGER 31 +#define FACILITY_BACKGROUNDCOPY 32 +#define FACILITY_CONFIGURATION 33 +#define FACILITY_STATE_MANAGEMENT 34 +#define FACILITY_METADIRECTORY 35 +#define FACILITY_WINDOWSUPDATE 36 +#define FACILITY_DIRECTORYSERVICE 37 +#define FACILITY_GRAPHICS 38 +#define FACILITY_SHELL 39 +#define FACILITY_TPM_SERVICES 40 +#define FACILITY_TPM_SOFTWARE 41 +#define FACILITY_PLA 48 +#define FACILITY_FVE 49 +#define FACILITY_WINDOWS_DEFENDER 80 #define SEVERITY_SUCCESS 0 #define SEVERITY_ERROR 1 @@ -255,7 +284,13 @@ #define ERROR_INVALID_OPLOCK_PROTOCOL 301 #define ERROR_DISK_TOO_FRAGMENTED 302 #define ERROR_MR_MID_NOT_FOUND 317 +#define ERROR_SCOPE_NOT_FOUND 318 +#define ERROR_FAIL_NOACTION_REBOOT 350 +#define ERROR_FAIL_SHUTDOWN 351 +#define ERROR_FAIL_RESTART 352 +#define ERROR_MAX_SESSIONS_REACHED 353 #define ERROR_INVALID_ADDRESS 487 +#define ERROR_USER_PROFILE_LOAD 500 #define ERROR_ARITHMETIC_OVERFLOW 534 #define ERROR_PIPE_CONNECTED 535 #define ERROR_PIPE_LISTENING 536

1 0

Francois Gouget : advapi32: Fix the LsaEnumerateAccountRights() export.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: cf49dc36c764e96d5453a6effdfc2591e5eee4f6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cf49dc36c764e96d5453a6e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 21 18:18:32 2006 +0100 advapi32: Fix the LsaEnumerateAccountRights() export. --- dlls/advapi32/advapi32.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 2fdd9ca..1f23818 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -351,7 +351,7 @@ @ stdcall LsaCreateTrustedDomainEx(ptr ptr ptr long ptr) @ stub LsaDelete @ stdcall LsaDeleteTrustedDomain(ptr ptr) -@ stdcall LsaEnumerateAccountRights(ptr ptr long ptr long) +@ stdcall LsaEnumerateAccountRights(ptr ptr ptr ptr) @ stub LsaEnumerateAccounts @ stdcall LsaEnumerateAccountsWithUserRight(ptr ptr ptr ptr) @ stub LsaEnumeratePrivileges

1 0

Francois Gouget : include: Standardize the LsaLookupNames() prototype.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: 5b993191a9a20aa6b85ee6beabeda204d1135f02 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5b993191a9a20aa6b85ee6b… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 21 18:16:47 2006 +0100 include: Standardize the LsaLookupNames() prototype. --- include/ntsecapi.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/ntsecapi.h b/include/ntsecapi.h index a775be7..b5f969b 100644 --- a/include/ntsecapi.h +++ b/include/ntsecapi.h @@ -277,7 +277,7 @@ NTSTATUS WINAPI LsaEnumerateAccountsWith NTSTATUS WINAPI LsaEnumerateTrustedDomains(LSA_HANDLE,PLSA_ENUMERATION_HANDLE,PVOID*,ULONG,PULONG); NTSTATUS WINAPI LsaEnumerateTrustedDomainsEx(LSA_HANDLE,PLSA_ENUMERATION_HANDLE,PVOID*,ULONG,PULONG); NTSTATUS WINAPI LsaFreeMemory(PVOID); -NTSTATUS WINAPI LsaLookupNames(LSA_HANDLE,ULONG Count,PLSA_UNICODE_STRING,PLSA_REFERENCED_DOMAIN_LIST*, +NTSTATUS WINAPI LsaLookupNames(LSA_HANDLE,ULONG,PLSA_UNICODE_STRING,PLSA_REFERENCED_DOMAIN_LIST*, PLSA_TRANSLATED_SID*); NTSTATUS WINAPI LsaLookupNames2(LSA_HANDLE,ULONG,ULONG,PLSA_UNICODE_STRING,PLSA_REFERENCED_DOMAIN_LIST*, PLSA_TRANSLATED_SID2*);

1 0

Robert Shearman : oleaut: ITypeInfo:: GetIDsOfNames should search inherited interfaces
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: 4b19449b6b145880461fc133296fa26d9c1dc7c5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4b19449b6b145880461fc13… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Mar 21 13:45:51 2006 +0000 oleaut: ITypeInfo::GetIDsOfNames should search inherited interfaces regardless of what type they are. Add a test for this and dump type infos created with CreateDispTypeInfo. --- dlls/oleaut32/tests/typelib.c | 12 +++++++++++- dlls/oleaut32/typelib.c | 11 +++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 72021dd..1108496 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -227,13 +227,15 @@ static void test_CreateDispTypeInfo(void TYPEATTR *pTypeAttr; HREFTYPE href; FUNCDESC *pFuncDesc; + MEMBERID memid; static const WCHAR func1[] = {'f','u','n','c','1',0}; static const WCHAR func2[] = {'f','u','n','c','2',0}; static const WCHAR func3[] = {'f','u','n','c','3',0}; static const WCHAR parm1[] = {'p','a','r','m','1',0}; static const WCHAR parm2[] = {'p','a','r','m','2',0}; - + OLECHAR *name = (OLECHAR *)func1; + ifdata.pmethdata = methdata; ifdata.cMembers = sizeof(methdata) / sizeof(methdata[0]); @@ -293,6 +295,9 @@ static void test_CreateDispTypeInfo(void hr = ITypeInfo_GetRefTypeOfImplType(pTypeInfo, 0, &href); ok(hr == S_OK, "hr %08lx\n", hr); + todo_wine { + ok(href == 0, "href = 0x%lx\n", href); + } hr = ITypeInfo_GetRefTypeInfo(pTypeInfo, href, &pTI2); ok(hr == S_OK, "hr %08lx\n", hr); hr = ITypeInfo_GetTypeAttr(pTI2, &pTypeAttr); @@ -351,6 +356,11 @@ static void test_CreateDispTypeInfo(void ok(pFuncDesc->elemdescFunc.tdesc.vt == VT_I4, "ret vt %x\n", pFuncDesc->elemdescFunc.tdesc.vt); ITypeInfo_ReleaseFuncDesc(pTI2, pFuncDesc); + /* test GetIDsOfNames on a coclass to see if it searches its interfaces */ + hr = ITypeInfo_GetIDsOfNames(pTypeInfo, &name, 1, &memid); + ok(hr == S_OK, "hr 0x%08lx\n", hr); + ok(memid == 0x123, "memid 0x%08lx\n", memid); + ITypeInfo_Release(pTI2); ITypeInfo_Release(pTypeInfo); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index ede6de5..cfb17ba 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4784,9 +4784,8 @@ static HRESULT WINAPI ITypeInfo_fnGetIDs return ret; } } - /* not found, see if this is and interface with an inheritance */ - if(This->TypeAttr.cImplTypes && - (This->TypeAttr.typekind==TKIND_INTERFACE || This->TypeAttr.typekind==TKIND_DISPATCH)) { + /* not found, see if it can be found in an inherited interface */ + if(This->TypeAttr.cImplTypes) { /* recursive search */ ITypeInfo *pTInfo; ret=ITypeInfo_GetRefTypeInfo(iface, @@ -6338,7 +6337,7 @@ HRESULT WINAPI CreateDispTypeInfo( int param, func; TLBFuncDesc **ppFuncDesc; - TRACE_(typelib)("\n"); + TRACE("\n"); pTypeLibImpl = TypeLibImpl_Constructor(); if (!pTypeLibImpl) return E_FAIL; @@ -6394,6 +6393,8 @@ HRESULT WINAPI CreateDispTypeInfo( ppFuncDesc = &(*ppFuncDesc)->next; } + dump_TypeInfo(pTIIface); + pTypeLibImpl->pTypeInfo = pTIIface; pTypeLibImpl->TypeInfoCount++; @@ -6423,6 +6424,8 @@ HRESULT WINAPI CreateDispTypeInfo( pTIClass->reflist->reference = 1; pTIClass->reflist->pImpTLInfo = TLB_REF_INTERNAL; + dump_TypeInfo(pTIClass); + pTIIface->next = pTIClass; pTypeLibImpl->TypeInfoCount++;

1 0

Huw Davies : fonts: Use the EBLC table to retrieve the ascent of the bitmap font.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: 130a0e4f41e8f3c381942734be3c3f14030bce46 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=130a0e4f41e8f3c38194273… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 21 17:08:56 2006 +0000 fonts: Use the EBLC table to retrieve the ascent of the bitmap font. --- dlls/gdi/tests/gdiobj.c | 2 - tools/sfnt2fnt.c | 87 ++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 82 insertions(+), 7 deletions(-) diff --git a/dlls/gdi/tests/gdiobj.c b/dlls/gdi/tests/gdiobj.c index 35b19a3..f9a621b 100644 --- a/dlls/gdi/tests/gdiobj.c +++ b/dlls/gdi/tests/gdiobj.c @@ -235,9 +235,7 @@ static void test_bitmap_font_metrics(voi { "MS Serif", FW_NORMAL, 21, 16, 5, 3, 0, 9, 23 }, { "MS Serif", FW_NORMAL, 27, 21, 6, 3, 0, 12, 27 }, { "MS Serif", FW_NORMAL, 35, 27, 8, 3, 0, 16, 34 }, -#if 0 /* FIXME: enable once the bug in sfnt2fnt is fixed */ { "Courier", FW_NORMAL, 13, 11, 2, 0, 0, 8, 8 }, -#endif { "Courier", FW_NORMAL, 16, 13, 3, 0, 0, 9, 9 }, { "Courier", FW_NORMAL, 20, 16, 4, 0, 0, 12, 12 }, { "System", FW_BOLD, 16, 13, 3, 3, 0, 7, 15 } diff --git a/tools/sfnt2fnt.c b/tools/sfnt2fnt.c index 63e5b7a..921bb9a 100644 --- a/tools/sfnt2fnt.c +++ b/tools/sfnt2fnt.c @@ -34,6 +34,7 @@ #include FT_FREETYPE_H #include FT_SFNT_NAMES_H #include FT_TRUETYPE_TABLES_H +#include FT_TRUETYPE_TAGS_H #include "wine/unicode.h" #include "wine/wingdi16.h" @@ -53,6 +54,45 @@ typedef struct { DWORD offset; } CHAR_TABLE_ENTRY; +typedef struct { + DWORD version; + ULONG numSizes; +} eblcHeader_t; + +typedef struct { + CHAR ascender; + CHAR descender; + BYTE widthMax; + CHAR caretSlopeNumerator; + CHAR caretSlopeDenominator; + CHAR caretOffset; + CHAR minOriginSB; + CHAR minAdvanceSB; + CHAR maxBeforeBL; + CHAR maxAfterBL; + CHAR pad1; + CHAR pad2; +} sbitLineMetrics_t; + +typedef struct { + ULONG indexSubTableArrayOffset; + ULONG indexTableSize; + ULONG numberOfIndexSubTables; + ULONG colorRef; + sbitLineMetrics_t hori; + sbitLineMetrics_t vert; + USHORT startGlyphIndex; + USHORT endGlyphIndex; + BYTE ppemX; + BYTE ppemY; + BYTE bitDepth; + CHAR flags; +} bitmapSizeTable_t; + +#define GET_BE_WORD(ptr) MAKEWORD( ((BYTE *)(ptr))[1], ((BYTE *)(ptr))[0] ) +#define GET_BE_DWORD(ptr) ((DWORD)MAKELONG( GET_BE_WORD(&((WORD *)(ptr))[1]), \ + GET_BE_WORD(&((WORD *)(ptr))[0]) )) + #include "poppack.h" static const char *output_name; @@ -141,7 +181,7 @@ static int lookup_charset(int enc) static void fill_fontinfo(FT_Face face, int enc, FILE *fp, int dpi, unsigned char def_char, int avg_width) { - int ascent, il, ppem, descent, width_bytes = 0, space_size, max_width = 0; + int ascent = 0, il, ppem, descent = 0, width_bytes = 0, space_size, max_width = 0; FNT_HEADER hdr; FONTINFO16 fi; BYTE left_byte, right_byte, byte; @@ -153,6 +193,11 @@ static void fill_fontinfo(FT_Face face, const union cptable *cptable; FT_SfntName sfntname; TT_OS2 *os2; + FT_ULong needed; + eblcHeader_t *eblc; + bitmapSizeTable_t *size_table; + int num_sizes; + cptable = wine_cp_get_table(enc); if(!cptable) error("Can't find codepage %d\n", enc); @@ -165,12 +210,44 @@ static void fill_fontinfo(FT_Face face, } ppem = face->size->metrics.y_ppem; + + needed = 0; + if(FT_Load_Sfnt_Table(face, TTAG_EBLC, 0, NULL, &needed)) + error("Can't find EBLC table\n"); + + eblc = malloc(needed); + FT_Load_Sfnt_Table(face, TTAG_EBLC, 0, (FT_Byte *)eblc, &needed); + + num_sizes = GET_BE_DWORD(&eblc->numSizes); + + size_table = (bitmapSizeTable_t *)(eblc + 1); + for(i = 0; i < num_sizes; i++) + { + if(size_table->hori.ascender - size_table->hori.descender == ppem) + { + ascent = size_table->hori.ascender; + descent = -size_table->hori.descender; + break; + } + size_table++; + } + + /* Versions of fontforge prior to early 2006 have incorrect + ascender values in the eblc table, so we won't find the + correct bitmapSizeTable. In this case use the height of + the Aring glyph instead. */ + if(ascent == 0) + { + if(FT_Load_Char(face, 0xc5, FT_LOAD_DEFAULT)) + error("Can't find Aring\n"); + ascent = face->glyph->metrics.horiBearingY >> 6; + descent = ppem - ascent; + } + + free(eblc); + start = sizeof(FNT_HEADER) + sizeof(FONTINFO16); - if(FT_Load_Char(face, 0xc5, FT_LOAD_DEFAULT)) - error("Can't find Aring\n"); - ascent = face->glyph->metrics.height >> 6; - descent = ppem - ascent; if(FT_Load_Char(face, 'M', FT_LOAD_DEFAULT)) error("Can't find M\n"); il = ascent - (face->glyph->metrics.height >> 6);

1 0

Jeff Latimer : winedbg: Add display for floating point status.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: 0994126701b8f1612db054dc9c74559c049b14ba URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0994126701b8f1612db054d… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Mar 21 23:54:41 2006 +1100 winedbg: Add display for floating point status. Added code to examine and display floating point unit status into be_i386.c as info all-regs command. --- programs/winedbg/be_alpha.c | 2 + programs/winedbg/be_cpu.h | 2 + programs/winedbg/be_i386.c | 72 ++++++++++++++++++++++++++++++++++++++- programs/winedbg/be_ppc.c | 2 + programs/winedbg/dbg.y | 5 ++- programs/winedbg/debug.l | 2 + programs/winedbg/info.c | 3 +- programs/winedbg/tgt_active.c | 2 + programs/winedbg/tgt_minidump.c | 2 + programs/winedbg/winedbg.man.in | 2 + 10 files changed, 85 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=0994126701b8f1612db…

1 0

Alexandre Julliard : sfnt2fnt: Remove output file on failure.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: ef4440ad1b68d0e8007f632b3c27b0b511213ff9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ef4440ad1b68d0e8007f632… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 21 16:18:45 2006 +0100 sfnt2fnt: Remove output file on failure. --- tools/sfnt2fnt.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/tools/sfnt2fnt.c b/tools/sfnt2fnt.c index 6b9f341..63e5b7a 100644 --- a/tools/sfnt2fnt.c +++ b/tools/sfnt2fnt.c @@ -55,6 +55,8 @@ typedef struct { #include "poppack.h" +static const char *output_name; + static void usage(char **argv) { fprintf(stderr, "%s foo.ttf ppem enc dpi def_char avg_width\n", argv[0]); @@ -65,6 +67,12 @@ static void usage(char **argv) #define __attribute__(X) #endif +/* atexit handler to cleanup files */ +static void cleanup(void) +{ + if (output_name) unlink( output_name ); +} + static void error(const char *s, ...) __attribute__((format (printf, 1, 2))); static void error(const char *s, ...) @@ -377,10 +385,13 @@ int main(int argc, char **argv) sprintf(output, "%s-%d-%d-%d.fnt", name, enc, dpi, ppem); + atexit( cleanup ); fp = fopen(output, "w"); + output_name = output; fill_fontinfo(face, enc, fp, dpi, def_char, avg_width); fclose(fp); + output_name = NULL; exit(0); }

1 0

Alexandre Julliard : Added DLL_WINE_PREATTACH handling in a number of stub-only dlls.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: c39a5f0dbae4964f6a796fab467bed20ba4bbc85 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c39a5f0dbae4964f6a796fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 21 16:18:24 2006 +0100 Added DLL_WINE_PREATTACH handling in a number of stub-only dlls. --- dlls/activeds/activeds_main.c | 10 +++++++++- dlls/cfgmgr32/main.c | 16 ++++++++++++++++ dlls/cryptdll/cryptdll.c | 2 ++ dlls/d3dim/d3dim_main.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/d3drm/d3drm_main.c | 22 +++++++++++++++++++--- dlls/msnet32/msnet_main.c | 21 +++++++++++++++++++++ dlls/snmpapi/main.c | 2 ++ dlls/url/url_main.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/vdmdbg/vdmdbg.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/winnls32/winnls.c | 16 ++++++++++++++++ dlls/wintrust/wintrust_main.c | 17 +++++++++++++++++ 11 files changed, 213 insertions(+), 7 deletions(-) diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index d010a76..b296742 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -48,7 +48,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(activeds); BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(%p, %ld, %p)\n",hinstDLL, fdwReason, lpvReserved); - /* For the moment, do nothing here. */ + + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinstDLL ); + break; + } return TRUE; } diff --git a/dlls/cfgmgr32/main.c b/dlls/cfgmgr32/main.c index 10757d6..0312900 100644 --- a/dlls/cfgmgr32/main.c +++ b/dlls/cfgmgr32/main.c @@ -29,6 +29,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(cfgmgr32); +/*********************************************************************** + * DllMain (CFGMGR32.@) + */ +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( inst ); + break; + } + return TRUE; +} + CONFIGRET WINAPI CM_Get_Device_ID_ListA( PCSTR pszFilter, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags ) { diff --git a/dlls/cryptdll/cryptdll.c b/dlls/cryptdll/cryptdll.c index fcb8589..9c9b6d7 100644 --- a/dlls/cryptdll/cryptdll.c +++ b/dlls/cryptdll/cryptdll.c @@ -32,6 +32,8 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: { DisableThreadLibraryCalls(hinstDLL); diff --git a/dlls/d3dim/d3dim_main.c b/dlls/d3dim/d3dim_main.c index 67a01ed..0c0f022 100644 --- a/dlls/d3dim/d3dim_main.c +++ b/dlls/d3dim/d3dim_main.c @@ -1 +1,37 @@ -/* nothing here yet */ +/* + * Copyright 2006 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" + +/*********************************************************************** + * DllMain (D3DIM.@) + */ +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( inst ); + break; + } + return TRUE; +} diff --git a/dlls/d3drm/d3drm_main.c b/dlls/d3drm/d3drm_main.c index ecb7191..caa0f90 100644 --- a/dlls/d3drm/d3drm_main.c +++ b/dlls/d3drm/d3drm_main.c @@ -16,6 +16,22 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3drm); +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" + +/*********************************************************************** + * DllMain (D3DRM.@) + */ +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( inst ); + break; + } + return TRUE; +} diff --git a/dlls/msnet32/msnet_main.c b/dlls/msnet32/msnet_main.c index 40e9dc4..bc92f45 100644 --- a/dlls/msnet32/msnet_main.c +++ b/dlls/msnet32/msnet_main.c @@ -16,10 +16,31 @@ #include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msnet); + +/*********************************************************************** + * DllMain (MSNET32.@) + */ +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( inst ); + break; + } + return TRUE; +} + /*********************************************************************** * @ (MSNET32.57) */ diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index 326e6bc..fda8f35 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -39,6 +39,8 @@ BOOL WINAPI DllMain( TRACE("(%p,%ld,%p)\n", hInstDLL, fdwReason, lpvReserved); switch(fdwReason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDLL); break; diff --git a/dlls/url/url_main.c b/dlls/url/url_main.c index 67a01ed..b85e204 100644 --- a/dlls/url/url_main.c +++ b/dlls/url/url_main.c @@ -1 +1,37 @@ -/* nothing here yet */ +/* + * Copyright 2006 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" + +/*********************************************************************** + * DllMain (URL.@) + */ +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( inst ); + break; + } + return TRUE; +} diff --git a/dlls/vdmdbg/vdmdbg.c b/dlls/vdmdbg/vdmdbg.c index 67a01ed..3d272c0 100644 --- a/dlls/vdmdbg/vdmdbg.c +++ b/dlls/vdmdbg/vdmdbg.c @@ -1 +1,37 @@ -/* nothing here yet */ +/* + * Copyright 2006 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" + +/*********************************************************************** + * DllMain (VDMDBG.@) + */ +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( inst ); + break; + } + return TRUE; +} diff --git a/dlls/winnls32/winnls.c b/dlls/winnls32/winnls.c index 4172fc2..892ec1c 100644 --- a/dlls/winnls32/winnls.c +++ b/dlls/winnls32/winnls.c @@ -23,6 +23,22 @@ #include "wine/winuser16.h" /*********************************************************************** + * DllMain (WINNLS.@) + */ +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( inst ); + break; + } + return TRUE; +} + +/*********************************************************************** * WINNLSEnableIME (WINNLS.16) */ BOOL WINAPI WINNLSEnableIME16(HWND16 hWnd, BOOL fEnable) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 3d7ac5c..09ddfed 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -32,6 +32,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(wintrust); + +/*********************************************************************** + * DllMain (WINTRUST.@) + */ +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( inst ); + break; + } + return TRUE; +} + /*********************************************************************** * CryptCATAdminAcquireContext (WINTRUST.@) */

1 0

Mike McCormack : msi: Improve handling of short paths.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: c1513be48c414f4b862111ca5bd9bda85ab5c94b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c1513be48c414f4b862111c… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Mar 21 19:40:36 2006 +0900 msi: Improve handling of short paths. --- dlls/msi/action.c | 94 +++++++++++++++++++++++++--------------------------- dlls/msi/action.h | 4 ++ dlls/msi/files.c | 10 ++++-- dlls/msi/helpers.c | 55 +++++++++++++++++++++++------- 4 files changed, 98 insertions(+), 65 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 60907a9..6501031 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1269,6 +1269,17 @@ static UINT load_feature(MSIRECORD * row return ERROR_SUCCESS; } +static LPWSTR folder_split_path(LPWSTR p, WCHAR ch) +{ + if (!p) + return p; + p = strchrW(p, ch); + if (!p) + return p; + *p = 0; + return p+1; +} + static UINT load_file(MSIRECORD *row, LPVOID param) { MSIPACKAGE* package = (MSIPACKAGE*)param; @@ -1293,7 +1304,7 @@ static UINT load_file(MSIRECORD *row, LP reduce_to_longfilename( file->FileName ); file->ShortName = msi_dup_record_field( row, 3 ); - reduce_to_shortfilename( file->ShortName ); + file->LongName = strdupW( folder_split_path(file->ShortName, '|')); file->FileSize = MSI_RecordGetInteger( row, 4 ); file->Version = msi_dup_record_field( row, 5 ); @@ -1411,7 +1422,6 @@ static UINT ACTION_FileCost(MSIPACKAGE * return ERROR_SUCCESS; } - static MSIFOLDER *load_folder( MSIPACKAGE *package, LPCWSTR dir ) { static const WCHAR Query[] = @@ -1420,10 +1430,10 @@ static MSIFOLDER *load_folder( MSIPACKAG 'W','H','E','R','E',' ', '`', 'D','i','r','e','c','t', 'o','r','y','`', ' ','=',' ','\'','%','s','\'', 0}; - LPWSTR ptargetdir, targetdir, srcdir; + static const WCHAR szDot[] = { '.',0 }; + LPWSTR p, tgt_short, tgt_long, src_short, src_long; LPCWSTR parent; - LPWSTR shortname = NULL; - MSIRECORD * row = 0; + MSIRECORD *row; MSIFOLDER *folder; TRACE("Looking for dir %s\n",debugstr_w(dir)); @@ -1444,54 +1454,40 @@ static MSIFOLDER *load_folder( MSIPACKAG if (!row) return NULL; - ptargetdir = targetdir = msi_dup_record_field(row,3); + p = msi_dup_record_field(row, 3); /* split src and target dir */ - if (strchrW(targetdir,':')) - { - srcdir=strchrW(targetdir,':'); - *srcdir=0; - srcdir ++; - } - else - srcdir=NULL; + tgt_short = p; + src_short = folder_split_path( p, ':' ); - /* for now only pick long filename versions */ - if (strchrW(targetdir,'|')) - { - shortname = targetdir; - targetdir = strchrW(targetdir,'|'); - *targetdir = 0; - targetdir ++; - } - /* for the sourcedir pick the short filename */ - if (srcdir && strchrW(srcdir,'|')) - { - LPWSTR p = strchrW(srcdir,'|'); - *p = 0; - } - - /* now check for root dirs */ - if (targetdir[0] == '.' && targetdir[1] == 0) - targetdir = NULL; - - if (targetdir) - { - TRACE(" TargetDefault = %s\n",debugstr_w(targetdir)); - msi_free( folder->TargetDefault); - folder->TargetDefault = strdupW(targetdir); - } - - if (srcdir) - folder->SourceDefault = strdupW(srcdir); - else if (shortname) - folder->SourceDefault = strdupW(shortname); - else if (targetdir) - folder->SourceDefault = strdupW(targetdir); - msi_free(ptargetdir); - TRACE(" SourceDefault = %s\n", debugstr_w( folder->SourceDefault )); + /* split the long and short pathes */ + tgt_long = folder_split_path( tgt_short, '|' ); + src_long = folder_split_path( src_short, '|' ); + + /* check for root dirs */ + if (!lstrcmpW(szDot, tgt_short)) + tgt_short = NULL; + if (!lstrcmpW(szDot, tgt_long)) + tgt_long = NULL; + + if (!tgt_long) + tgt_long = tgt_short; + if (!src_short) + src_short = tgt_long; + if (!src_long) + src_long = src_short; + + /* FIXME: use the target short path too */ + folder->TargetDefault = strdupW(tgt_long); + folder->SourceShortPath = strdupW(src_long); + folder->SourceLongPath = strdupW(src_long); + msi_free(p); + + TRACE("TargetDefault = %s\n",debugstr_w( folder->TargetDefault )); + TRACE("SourceLong = %s\n", debugstr_w( folder->SourceLongPath )); + TRACE("SourceShort = %s\n", debugstr_w( folder->SourceShortPath )); - parent = MSI_RecordGetString(row,2); + parent = MSI_RecordGetString(row, 2); if (parent) { folder->Parent = load_folder( package, parent ); diff --git a/dlls/msi/action.h b/dlls/msi/action.h index 9b3e58d..be2654c 100644 --- a/dlls/msi/action.h +++ b/dlls/msi/action.h @@ -78,7 +78,8 @@ typedef struct tagMSIFOLDER struct list entry; LPWSTR Directory; LPWSTR TargetDefault; - LPWSTR SourceDefault; + LPWSTR SourceLongPath; + LPWSTR SourceShortPath; LPWSTR ResolvedTarget; LPWSTR ResolvedSource; @@ -109,6 +110,7 @@ typedef struct tagMSIFILE MSICOMPONENT *Component; LPWSTR FileName; LPWSTR ShortName; + LPWSTR LongName; INT FileSize; LPWSTR Version; LPWSTR Language; diff --git a/dlls/msi/files.c b/dlls/msi/files.c index b5c80ca..aa6f8e6 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -328,9 +328,15 @@ static VOID set_file_source(MSIPACKAGE* { if (file->Attributes & msidbFileAttributesNoncompressed) { - LPWSTR p; + LPWSTR p, path; p = resolve_folder(package, comp->Directory, TRUE, FALSE, NULL); - file->SourcePath = build_directory_name(2, p, file->ShortName); + path = build_directory_name(2, p, file->ShortName); + if (INVALID_FILE_ATTRIBUTES == GetFileAttributesW( path )) + { + msi_free(path); + path = build_directory_name(2, p, file->LongName); + } + file->SourcePath = path; msi_free(p); } else diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index af604a5..ffbde9f 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -355,21 +355,48 @@ LPWSTR resolve_folder(MSIPACKAGE *packag } else { - if (f->SourceDefault && f->SourceDefault[0]!='.') - path = build_directory_name( 3, p, f->SourceDefault, NULL ); - else - path = strdupW(p); - TRACE("source -> %s\n", debugstr_w(path)); + /* source may be in a few different places ... check each of them */ + path = NULL; - /* if the directory doesn't exist, use the root */ - if (INVALID_FILE_ATTRIBUTES == GetFileAttributesW( path )) + /* try the long path directory */ + if (f->SourceLongPath) { - msi_free( path ); - path = get_source_root( package ); - TRACE("defaulting to %s\n", debugstr_w(path)); + path = build_directory_name( 3, p, f->SourceLongPath, NULL ); + if (INVALID_FILE_ATTRIBUTES == GetFileAttributesW( path )) + { + msi_free( path ); + path = NULL; + } } - else - f->ResolvedSource = strdupW( path ); + + /* try the short path directory */ + if (!path && f->SourceShortPath) + { + path = build_directory_name( 3, p, f->SourceShortPath, NULL ); + if (INVALID_FILE_ATTRIBUTES == GetFileAttributesW( path )) + { + msi_free( path ); + path = NULL; + } + } + + /* try the parent folder's path */ + if (!path) + { + path = strdupW(p); + if (INVALID_FILE_ATTRIBUTES == GetFileAttributesW( path )) + { + msi_free( path ); + path = NULL; + } + } + + /* try the root of the install */ + if (!path) + path = get_source_root( package ); + + TRACE("source -> %s\n", debugstr_w(path)); + f->ResolvedSource = strdupW( path ); } msi_free(p); } @@ -508,7 +535,8 @@ void ACTION_free_package_structures( MSI list_remove( &folder->entry ); msi_free( folder->Directory ); msi_free( folder->TargetDefault ); - msi_free( folder->SourceDefault ); + msi_free( folder->SourceLongPath ); + msi_free( folder->SourceShortPath ); msi_free( folder->ResolvedTarget ); msi_free( folder->ResolvedSource ); msi_free( folder->Property ); @@ -537,6 +565,7 @@ void ACTION_free_package_structures( MSI msi_free( file->File ); msi_free( file->FileName ); msi_free( file->ShortName ); + msi_free( file->LongName ); msi_free( file->Version ); msi_free( file->Language ); msi_free( file->SourcePath );

1 0

Robert Shearman : ntdll: Start of pooling support for RtlQueueWorkItem.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: f40f81b6d5e120529b6ef61aecf0b1068ff6ee8c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f40f81b6d5e120529b6ef61… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Mar 21 13:44:14 2006 +0000 ntdll: Start of pooling support for RtlQueueWorkItem. Start of pooling support for RtlQueueWorkItem. The algorithm implmented is very simple - if there are no free threads, create a new one. --- dlls/ntdll/threadpool.c | 137 +++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 124 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 10bda48..15726bb 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -18,7 +18,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> +#include <limits.h> #define NONAMELESSUNION #include "ntstatus.h" @@ -26,35 +30,123 @@ #include "winternl.h" #include "wine/debug.h" +#include "wine/list.h" + #include "ntdll_misc.h" WINE_DEFAULT_DEBUG_CHANNEL(threadpool); +#define WORKER_TIMEOUT 30000 /* 30 seconds */ + +static LONG num_workers; +static LONG num_work_items; +static LONG num_busy_workers; + +static struct list work_item_list = LIST_INIT(work_item_list); +static HANDLE work_item_event; + +static CRITICAL_SECTION threadpool_cs; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &threadpool_cs, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": threadpool_cs") } +}; +static CRITICAL_SECTION threadpool_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; + struct work_item { + struct list entry; PRTL_WORK_ITEM_ROUTINE function; PVOID context; }; +inline static LONG interlocked_inc( PLONG dest ) +{ + return interlocked_xchg_add( (int *)dest, 1 ) + 1; +} + +inline static LONG interlocked_dec( PLONG dest ) +{ + return interlocked_xchg_add( (int *)dest, -1 ) - 1; +} + static void WINAPI worker_thread_proc(void * param) { - struct work_item *work_item_ptr = (struct work_item *)param; - struct work_item work_item; + interlocked_inc(&num_workers); /* free the work item memory sooner to reduce memory usage */ - work_item = *work_item_ptr; - RtlFreeHeap(GetProcessHeap(), 0, work_item_ptr); - - TRACE("executing %p(%p)\n", work_item.function, work_item.context); + while (TRUE) + { + if (num_work_items > 0) + { + struct list *item; + RtlEnterCriticalSection(&threadpool_cs); + item = list_head(&work_item_list); + if (item) + { + struct work_item *work_item_ptr = LIST_ENTRY(item, struct work_item, entry); + struct work_item work_item; + list_remove(&work_item_ptr->entry); + interlocked_dec(&num_work_items); + + RtlLeaveCriticalSection(&threadpool_cs); + + work_item = *work_item_ptr; + RtlFreeHeap(GetProcessHeap(), 0, work_item_ptr); + + TRACE("executing %p(%p)\n", work_item.function, work_item.context); + + interlocked_inc(&num_busy_workers); + + /* do the work */ + work_item.function(work_item.context); + + interlocked_dec(&num_busy_workers); + } + else + RtlLeaveCriticalSection(&threadpool_cs); + } + else + { + NTSTATUS status; + LARGE_INTEGER timeout; + timeout.QuadPart = -(WORKER_TIMEOUT * (ULONGLONG)10000); + status = NtWaitForSingleObject(work_item_event, FALSE, &timeout); + if (status != STATUS_WAIT_0) + break; + } + } - /* do the work */ - work_item.function(work_item.context); + interlocked_dec(&num_workers); RtlExitUserThread(0); /* never reached */ } +static NTSTATUS add_work_item_to_queue(struct work_item *work_item) +{ + NTSTATUS status; + + RtlEnterCriticalSection(&threadpool_cs); + list_add_tail(&work_item_list, &work_item->entry); + num_work_items++; + RtlLeaveCriticalSection(&threadpool_cs); + + if (!work_item_event) + { + HANDLE sem; + status = NtCreateSemaphore(&sem, SEMAPHORE_ALL_ACCESS, NULL, 1, LONG_MAX); + if (interlocked_cmpxchg_ptr( (PVOID *)&work_item_event, (PVOID)sem, 0 )) + NtClose(sem); /* somebody beat us to it */ + } + else + status = NtReleaseSemaphore(work_item_event, 1, NULL); + + return status; +} + /*********************************************************************** * RtlQueueWorkItem (NTDLL.@) * @@ -92,16 +184,35 @@ NTSTATUS WINAPI RtlQueueWorkItem(PRTL_WO if (Flags != WT_EXECUTEDEFAULT) FIXME("Flags 0x%lx not supported\n", Flags); - /* FIXME: very crude implementation that doesn't support pooling at all */ - status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, - NULL, 0, 0, - worker_thread_proc, work_item, &thread, NULL ); + status = add_work_item_to_queue(work_item); + + if ((status == STATUS_SUCCESS) && + ((num_workers == 0) || (num_workers == num_busy_workers))) + { + status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, + NULL, 0, 0, + worker_thread_proc, NULL, &thread, NULL ); + if (status == STATUS_SUCCESS) + NtClose( thread ); + + /* NOTE: we don't care if we couldn't create the thread if there is at + * least one other available to process the request */ + if ((num_workers > 0) && (status != STATUS_SUCCESS)) + status = STATUS_SUCCESS; + } + if (status != STATUS_SUCCESS) { + RtlEnterCriticalSection(&threadpool_cs); + + interlocked_dec(&num_work_items); + list_remove(&work_item->entry); RtlFreeHeap(GetProcessHeap(), 0, work_item); + + RtlLeaveCriticalSection(&threadpool_cs); + return status; } - NtClose( thread ); return STATUS_SUCCESS; }

1 0

Robert Shearman : kernel: Add a test for QueueUserWorkItem.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: 6f2b0fbf94b23fb98c050dd96d8b7f2084995e57 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6f2b0fbf94b23fb98c050dd… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Mar 21 13:43:06 2006 +0000 kernel: Add a test for QueueUserWorkItem. --- dlls/kernel/tests/thread.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/kernel/tests/thread.c b/dlls/kernel/tests/thread.c index 444217d..9788447 100644 --- a/dlls/kernel/tests/thread.c +++ b/dlls/kernel/tests/thread.c @@ -677,6 +677,42 @@ static void test_SetThreadContext(void) #endif /* __i386__ */ +static HANDLE finish_event; +static LONG times_executed; + +static DWORD CALLBACK work_function(void *p) +{ + LONG executed = InterlockedIncrement(&times_executed); + + if (executed == 100) + SetEvent(finish_event); + return 0; +} + +static void test_QueueUserWorkItem(void) +{ + int i; + DWORD wait_result; + DWORD before, after; + + finish_event = CreateEvent(NULL, TRUE, FALSE, NULL); + + before = GetTickCount(); + + for (i = 0; i < 100; i++) + { + BOOL ret = QueueUserWorkItem(work_function, (void *)i, WT_EXECUTEDEFAULT); + ok(ret, "QueueUserWorkItem failed with error %ld\n", GetLastError()); + } + + wait_result = WaitForSingleObject(finish_event, 10000); + + after = GetTickCount(); + trace("100 QueueUserWorkItem calls took %ldms\n", after - before); + ok(wait_result == WAIT_OBJECT_0, "wait failed with error 0x%lx\n", wait_result); + + ok(times_executed == 100, "didn't execute all of the work items\n"); +} START_TEST(thread) { @@ -702,4 +738,5 @@ START_TEST(thread) #ifdef __i386__ test_SetThreadContext(); #endif + test_QueueUserWorkItem(); }

1 0

Robert Shearman : oleaut: Better support for invoking methods with VT_VARIANT argument types.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: 264b122d52405864db8c2807548bc65e88e9cc42 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=264b122d52405864db8c280… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Mar 21 13:45:22 2006 +0000 oleaut: Better support for invoking methods with VT_VARIANT argument types. --- dlls/oleaut32/typelib.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 317b44c..ede6de5 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5110,7 +5110,10 @@ DispCallFunc( { VARIANT *arg = prgpvarg[i]; TRACE("Storing arg %d (%d as %d)\n",i,V_VT(arg),prgvt[i]); - memcpy(&args[argspos], &V_NONE(arg), _argsize(prgvt[i]) * sizeof(DWORD)); + if (prgvt[i] == VT_VARIANT) + memcpy(&args[argspos], arg, _argsize(prgvt[i]) * sizeof(DWORD)); + else + memcpy(&args[argspos], &V_NONE(arg), _argsize(prgvt[i]) * sizeof(DWORD)); argspos += _argsize(prgvt[i]); } @@ -5231,20 +5234,26 @@ static HRESULT WINAPI ITypeInfo_fnInvoke else if (i < pDispParams->cArgs) { VARIANTARG *src_arg = &pDispParams->rgvarg[pDispParams->cArgs - 1 - i]; - V_VT(&rgvarg[i]) = V_VT(src_arg); dump_Variant(src_arg); - /* FIXME: this doesn't work for VT_BYREF arguments if - * they are not the same type as in the paramdesc */ - if ((rgvt[i] & VT_BYREF) && !V_ISBYREF(src_arg)) + if (rgvt[i] == VT_VARIANT) + VariantCopy(&rgvarg[i], src_arg); + else if ((rgvt[i] & VT_BYREF) && !V_ISBYREF(src_arg)) { VARIANTARG *missing_arg = INVBUF_GET_MISSING_ARG_ARRAY(buffer, func_desc->cParams); V_VT(&missing_arg[i]) = V_VT(src_arg); hres = VariantChangeType(&missing_arg[i], src_arg, 0, rgvt[i] & ~VT_BYREF); V_BYREF(&rgvarg[i]) = &V_NONE(&missing_arg[i]); + V_VT(&rgvarg[i]) = rgvt[i]; } else + { + /* FIXME: this doesn't work for VT_BYREF arguments if + * they are not the same type as in the paramdesc */ + V_VT(&rgvarg[i]) = V_VT(src_arg); hres = VariantChangeType(&rgvarg[i], src_arg, 0, rgvt[i]); + V_VT(&rgvarg[i]) = rgvt[i]; + } if (FAILED(hres)) { @@ -5253,7 +5262,6 @@ static HRESULT WINAPI ITypeInfo_fnInvoke debugstr_VT(src_arg), debugstr_VF(src_arg)); break; } - V_VT(&rgvarg[i]) = rgvt[i]; prgpvarg[i] = &rgvarg[i]; } else if (wParamFlags & PARAMFLAG_FOPT)

1 0

Robert Shearman : wininet: Document InternetCrackUrlW.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: dc03c0e3f364a8c4c6f907d357cc56384c9bce6c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dc03c0e3f364a8c4c6f907d… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Mar 21 13:45:03 2006 +0000 wininet: Document InternetCrackUrlW. --- dlls/wininet/internet.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index cde3d52..0402d82 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1124,14 +1124,7 @@ static void ConvertUrlComponentValue(LPS /*********************************************************************** * InternetCrackUrlA (WININET.@) * - * Break up URL into its components - * - * TODO: Handle dwFlags - * - * RETURNS - * TRUE on success - * FALSE on failure - * + * See InternetCrackUrlW. */ BOOL WINAPI InternetCrackUrlA(LPCSTR lpszUrl, DWORD dwUrlLength, DWORD dwFlags, LPURL_COMPONENTSA lpUrlComponents) @@ -1285,6 +1278,12 @@ static BOOL SetUrlComponentValueW(LPWSTR /*********************************************************************** * InternetCrackUrlW (WININET.@) + * + * Break up URL into its components + * + * RETURNS + * TRUE on success + * FALSE on failure */ BOOL WINAPI InternetCrackUrlW(LPCWSTR lpszUrl_orig, DWORD dwUrlLength_orig, DWORD dwFlags, LPURL_COMPONENTSW lpUC)

1 0

Robert Shearman : wininet: InternetCreateUrlW should return the number of bytes needed.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: 80e4fb597537b6db4f38a35783131d6f0906a02e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=80e4fb597537b6db4f38a35… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Mar 21 13:44:36 2006 +0000 wininet: InternetCreateUrlW should return the number of bytes needed. InternetCreateUrlW should return the number of bytes needed to store the URL, not the number of characters (reported by Sven Paschukat). --- dlls/wininet/http.c | 5 +++-- dlls/wininet/internet.c | 25 ++++++++++++++++++++----- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 1a2638c..76f7b7e 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2003,9 +2003,10 @@ static BOOL HTTP_HandleRedirect(LPWININE (GetLastError() != ERROR_INSUFFICIENT_BUFFER)) return FALSE; - url_length++; /* for nul terminating character */ - orig_url = HeapAlloc(GetProcessHeap(), 0, url_length * sizeof(WCHAR)); + orig_url = HeapAlloc(GetProcessHeap(), 0, url_length); + /* convert from bytes to characters */ + url_length = url_length / sizeof(WCHAR) - 1; if (!InternetCreateUrlW(&urlComponents, 0, orig_url, &url_length)) { HeapFree(GetProcessHeap(), 0, orig_url); diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 42eb61d..cde3d52 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3900,10 +3900,7 @@ static void convert_urlcomp_atow(LPURL_C /*********************************************************************** * InternetCreateUrlA (WININET.@) * - * RETURNS - * TRUE on success - * FALSE on failure - * + * See InternetCreateUrlW. */ BOOL WINAPI InternetCreateUrlA(LPURL_COMPONENTSA lpUrlComponents, DWORD dwFlags, LPSTR lpszUrl, LPDWORD lpdwUrlLength) @@ -3930,6 +3927,9 @@ BOOL WINAPI InternetCreateUrlA(LPURL_COM ret = InternetCreateUrlW(&urlCompW, dwFlags, urlW, lpdwUrlLength); + if (!ret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) + *lpdwUrlLength /= sizeof(WCHAR); + /* on success, lpdwUrlLength points to the size of urlW in WCHARS * minus one, so add one to leave room for NULL terminator */ @@ -3950,6 +3950,21 @@ BOOL WINAPI InternetCreateUrlA(LPURL_COM /*********************************************************************** * InternetCreateUrlW (WININET.@) * + * Creates a URL from its component parts. + * + * PARAMS + * lpUrlComponents [I] URL Components. + * dwFlags [I] Flags. See notes. + * lpszUrl [I] Buffer in which to store the created URL. + * lpdwUrlLength [I/O] On input, the length of the buffer pointed to by + * lpszUrl in characters. On output, the number of bytes + * required to store the URL including terminator. + * + * NOTES + * + * The dwFlags parameter can be zero or more of the following: + *|ICU_ESCAPE - Generates escape sequences for unsafe characters in the path and extra info of the URL. + * * RETURNS * TRUE on success * FALSE on failure @@ -3980,7 +3995,7 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COM if (!lpszUrl || *lpdwUrlLength < dwLen) { - *lpdwUrlLength = dwLen + 1; /* terminating null */ + *lpdwUrlLength = (dwLen + 1) * sizeof(WCHAR); SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; }

1 0

Alexandre Julliard : ntdll: Added a DLL_WINE_PREATTACH call to DllMain for builtins.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: c307f4990fe89b4a958efcc9107bf25aef6c01d0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c307f4990fe89b4a958efcc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 21 15:10:22 2006 +0100 ntdll: Added a DLL_WINE_PREATTACH call to DllMain for builtins. By returning FALSE from this call, a builtin dll can specify that we should try to load the native one instead. --- dlls/ntdll/loader.c | 16 +++++++++++++--- include/winnt.h | 4 +++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 967c298..88878c4 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -58,7 +58,9 @@ static const char * const reason_names[] "PROCESS_DETACH", "PROCESS_ATTACH", "THREAD_ATTACH", - "THREAD_DETACH" + "THREAD_DETACH", + NULL, NULL, NULL, NULL, + "WINE_PREATTACH" }; static const WCHAR dllW[] = {'.','d','l','l',0}; @@ -1749,10 +1751,18 @@ static NTSTATUS load_dll( LPCWSTR load_p case LO_BUILTIN_NATIVE: case LO_DEFAULT: /* default is builtin,native */ nts = load_builtin_dll( load_path, filename, handle, flags, pwm ); - if (nts == STATUS_SUCCESS) break; if (!handle) break; /* nothing else we can try */ /* file is not a builtin library, try without using the specified file */ - nts = load_builtin_dll( load_path, filename, 0, flags, pwm ); + if (nts != STATUS_SUCCESS) + nts = load_builtin_dll( load_path, filename, 0, flags, pwm ); + if (nts == STATUS_SUCCESS && loadorder == LO_DEFAULT && + !MODULE_InitDLL( *pwm, DLL_WINE_PREATTACH, NULL )) + { + /* stub-only dll, try native */ + TRACE( "%s pre-attach returned FALSE, preferring native\n", debugstr_w(filename) ); + LdrUnloadDll( (*pwm)->ldr.BaseAddress ); + nts = STATUS_DLL_NOT_FOUND; + } if (nts == STATUS_DLL_NOT_FOUND && loadorder != LO_BUILTIN) nts = load_native_dll( load_path, filename, handle, flags, pwm ); break; diff --git a/include/winnt.h b/include/winnt.h index 199383b..053f014 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -469,7 +469,9 @@ typedef DWORD FLONG; #define DLL_PROCESS_ATTACH 1 /* attach process (load library) */ #define DLL_THREAD_ATTACH 2 /* attach new thread */ #define DLL_THREAD_DETACH 3 /* detach thread */ - +#ifdef __WINESRC__ +#define DLL_WINE_PREATTACH 8 /* called before process attach for Wine builtins */ +#endif /* u.x.wProcessorArchitecture (NT) */ #define PROCESSOR_ARCHITECTURE_INTEL 0

1 0

Alexandre Julliard : ddraw: Call DDRAW_ChooseDefaultDriver only on PROCESS_ATTACH.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: 8b3e42682122908477e8439a1b67867fb3cf3494 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8b3e42682122908477e8439… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 21 15:06:36 2006 +0100 ddraw: Call DDRAW_ChooseDefaultDriver only on PROCESS_ATTACH. --- dlls/ddraw/main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index d9abebe..7783b37 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -677,10 +677,10 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, opengl_initialized = DDRAW_bind_to_opengl(); #endif /* HAVE_OPENGL */ s3tc_initialized = DDRAW_bind_to_s3tc(); - } - if (DDRAW_num_drivers > 0) - DDRAW_default_driver = DDRAW_ChooseDefaultDriver(); + if (DDRAW_num_drivers > 0) + DDRAW_default_driver = DDRAW_ChooseDefaultDriver(); + } return TRUE; }

1 0

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 : winewrapper: Remove explicit call to wineprefixcreate.
by Alexandre Julliard 21 Mar '06

21 Mar '06

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 : wcmd: Try executing the process even if the exe file doesn't exist.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: 5ac2238ad074d652c70da4691c1028f264592888 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5ac2238ad074d652c70da46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 21 12:00:17 2006 +0100 wcmd: Try executing the process even if the exe file doesn't exist. It may be a builtin exe in which case the CreateProcess call will succeed. --- programs/wcmd/wcmdmain.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/wcmd/wcmdmain.c b/programs/wcmd/wcmdmain.c index 6bc9272..db092b5 100644 --- a/programs/wcmd/wcmdmain.c +++ b/programs/wcmd/wcmdmain.c @@ -594,11 +594,11 @@ char filetorun[MAX_PATH]; /* No batch file found, assume executable */ hinst = FindExecutable (param1, NULL, filetorun); - if ((int)hinst < 32) { - WCMD_print_error (); - return; - } - console = SHGetFileInfo (filetorun, 0, &psfi, sizeof(psfi), SHGFI_EXETYPE); + if ((int)hinst < 32) + console = 0; + else + console = SHGetFileInfo (filetorun, 0, &psfi, sizeof(psfi), SHGFI_EXETYPE); + ZeroMemory (&st, sizeof(STARTUPINFO)); st.cb = sizeof(STARTUPINFO); init_msvcrt_io_block(&st);

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

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

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

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

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

21 Mar '06

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 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

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

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 : winefile: 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: 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 20 Mar '06

20 Mar '06

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 20 Mar '06

20 Mar '06

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 20 Mar '06

20 Mar '06

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 20 Mar '06

20 Mar '06

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 20 Mar '06

20 Mar '06

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 20 Mar '06

20 Mar '06

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 20 Mar '06

20 Mar '06

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 20 Mar '06

20 Mar '06

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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2006