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

Paul Vriens : kernel: Add processor specific environment variables.
by Alexandre Julliard March 23, 2006

March 23, 2006

Module: wine Branch: refs/heads/master Commit: 418b839980cffb8fa2bceef3f1c7f8dd59a1058a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=418b839980cffb8fa2bceef… Author: Paul Vriens <paul.vriens(a)xs4all.nl> Date: Wed Mar 22 11:43:19 2006 +0100 kernel: Add processor specific environment variables. --- dlls/kernel/cpu.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 74 insertions(+), 2 deletions(-) diff --git a/dlls/kernel/cpu.c b/dlls/kernel/cpu.c index 6e0ef78..8dca1f5 100644 --- a/dlls/kernel/cpu.c +++ b/dlls/kernel/cpu.c @@ -102,7 +102,7 @@ static inline int have_cpuid(void) static BYTE PF[64] = {0,}; static ULONGLONG cpuHz = 1000000000; /* default to a 1GHz */ -static void create_registry_keys( const SYSTEM_INFO *info ) +static void create_system_registry_keys( const SYSTEM_INFO *info ) { static const WCHAR SystemW[] = {'M','a','c','h','i','n','e','\\', 'H','a','r','d','w','a','r','e','\\', @@ -177,6 +177,73 @@ static void create_registry_keys( const NtClose( system_key ); } +static void create_env_registry_keys( const SYSTEM_INFO *info ) +{ + static const WCHAR EnvironW[] = {'M','a','c','h','i','n','e','\\', + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'S','e','s','s','i','o','n',' ','M','a','n','a','g','e','r','\\', + 'E','n','v','i','r','o','n','m','e','n','t',0}; + static const WCHAR NumProcW[] = {'N','U','M','B','E','R','_','O','F','_','P','R','O','C','E','S','S','O','R','S',0}; + static const WCHAR ProcArchW[] = {'P','R','O','C','E','S','S','O','R','_','A','R','C','H','I','T','E','C','T','U','R','E',0}; + static const WCHAR x86W[] = {'x','8','6',0}; + static const WCHAR ProcIdW[] = {'P','R','O','C','E','S','S','O','R','_','I','D','E','N','T','I','F','I','E','R',0}; + static const WCHAR ProcLvlW[] = {'P','R','O','C','E','S','S','O','R','_','L','E','V','E','L',0}; + static const WCHAR ProcRevW[] = {'P','R','O','C','E','S','S','O','R','_','R','E','V','I','S','I','O','N',0}; + + HANDLE env_key; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW, valueW; + + char nProc[10],id[60],procLevel[10],rev[10]; + WCHAR nProcW[10],idW[60],procLevelW[10],revW[10]; + + /* Create some keys under HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment. + * All these environment variables are processor related and will be read during process initialization and hence + * show up in the environment of that process. + */ + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + RtlInitUnicodeString( &nameW, EnvironW ); + if (NtCreateKey( &env_key, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL )) return; + + sprintf( nProc, "%ld", info->dwNumberOfProcessors ); + RtlMultiByteToUnicodeN( nProcW, sizeof(nProcW), NULL, nProc, strlen(nProc)+1 ); + RtlInitUnicodeString( &valueW, NumProcW ); + NtSetValueKey( env_key, &valueW, 0, REG_SZ, nProcW, (strlenW(nProcW)+1)*sizeof(WCHAR) ); + + /* TODO: currently hardcoded x86, add different processors */ + RtlInitUnicodeString( &valueW, ProcArchW ); + NtSetValueKey( env_key, &valueW, 0, REG_SZ, x86W, (strlenW(x86W)+1) * sizeof(WCHAR) ); + + /* TODO: currently hardcoded Intel, add different processors */ + sprintf( id, "x86 Family %d Model %d Stepping %d, GenuineIntel", + info->wProcessorLevel, HIBYTE(info->wProcessorRevision), LOBYTE(info->wProcessorRevision) ); + RtlMultiByteToUnicodeN( idW, sizeof(idW), NULL, id, strlen(id)+1 ); + RtlInitUnicodeString( &valueW, ProcIdW ); + NtSetValueKey( env_key, &valueW, 0, REG_SZ, idW, (strlenW(idW)+1)*sizeof(WCHAR) ); + + sprintf( procLevel, "%d", info->wProcessorLevel ); + RtlMultiByteToUnicodeN( procLevelW, sizeof(procLevelW), NULL, procLevel, strlen(procLevel)+1 ); + RtlInitUnicodeString( &valueW, ProcLvlW ); + NtSetValueKey( env_key, &valueW, 0, REG_SZ, procLevelW, (strlenW(procLevelW)+1)*sizeof(WCHAR) ); + + /* Properly report model/stepping */ + sprintf( rev, "%04x", info->wProcessorRevision); + RtlMultiByteToUnicodeN( revW, sizeof(revW), NULL, rev, strlen(rev)+1 ); + RtlInitUnicodeString( &valueW, ProcRevW ); + NtSetValueKey( env_key, &valueW, 0, REG_SZ, revW, (strlenW(revW)+1)*sizeof(WCHAR) ); + + NtClose( env_key ); +} + /**************************************************************************** * QueryPerformanceCounter (KERNEL32.@) * @@ -239,6 +306,10 @@ BOOL WINAPI QueryPerformanceFrequency(PL * Note that there is a hierarchy for every processor installed, so this * supports multiprocessor systems. This is done like Win95 does it, I think. * + * It creates some registry entries in the environment part: + * "\HKLM\System\CurrentControlSet\Control\Session Manager\Environment". These are + * always present. When deleted, Windows will add them again. + * * It also creates a cached flag array for IsProcessorFeaturePresent(). */ VOID WINAPI GetSystemInfo( @@ -702,7 +773,8 @@ VOID WINAPI GetSystemInfo( si->dwActiveProcessorMask, si->dwNumberOfProcessors, si->dwProcessorType, si->dwAllocationGranularity, si->wProcessorLevel, si->wProcessorRevision); - create_registry_keys( &cachedsi ); + create_system_registry_keys( &cachedsi ); + create_env_registry_keys( &cachedsi ); }

1 0

James Hawkins : comctl32: A couple fixes for tab icon offsets.
by Alexandre Julliard March 23, 2006

March 23, 2006

Module: wine Branch: refs/heads/master Commit: aa57ad373d50caf3d48c22a814ead474098cba32 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aa57ad373d50caf3d48c22a… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Mar 23 00:07:10 2006 -0600 comctl32: A couple fixes for tab icon offsets. - Shift selected icons up and non-selected icons down. - Add the top or left draw rect to the vertical offset, because it may not be zero. --- dlls/comctl32/tab.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 5c9443c..fa02477 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -1747,14 +1747,20 @@ TAB_DrawItemInterior if(lStyle & TCS_VERTICAL) { center_offset_h = ((drawRect->bottom - drawRect->top) - (cy + infoPtr->uHItemPadding + (rcText.right - rcText.left))) / 2; - center_offset_v = ((drawRect->right - drawRect->left) - (cx + infoPtr->uVItemPadding)) / 2; + center_offset_v = (drawRect->left + (drawRect->right - drawRect->left) - cx) / 2; } else { center_offset_h = ((drawRect->right - drawRect->left) - (cx + infoPtr->uHItemPadding + (rcText.right - rcText.left))) / 2; - center_offset_v = ((drawRect->bottom - drawRect->top) - (cy + infoPtr->uVItemPadding)) / 2; + center_offset_v = (drawRect->top + (drawRect->bottom - drawRect->top) - cy) / 2; } + /* if an item is selected, the icon is shifted up instead of down */ + if (iItem == infoPtr->iSelected) + center_offset_v -= infoPtr->uVItemPadding / 2; + else + center_offset_v += infoPtr->uVItemPadding / 2; + if (lStyle & TCS_FIXEDWIDTH && lStyle & (TCS_FORCELABELLEFT | TCS_FORCEICONLEFT)) center_offset_h = infoPtr->uHItemPadding;

1 0

James Hawkins : advpack: Implement FileSaveMarkNotExistW.
by Alexandre Julliard March 23, 2006

March 23, 2006

Module: wine Branch: refs/heads/master Commit: bed3d4d3eb5e6662c2804ba7b556cd507e0dae52 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bed3d4d3eb5e6662c2804ba… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Mar 22 14:40:55 2006 -0600 advpack: Implement FileSaveMarkNotExistW. --- dlls/advpack/advpack.spec | 2 +- dlls/advpack/files.c | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index 7481127..3ebe357 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -20,7 +20,7 @@ # stdcall ExtractFilesW(wstr wstr long ptr ptr long) @ stdcall ExtractFiles(str str long ptr ptr long) ExtractFilesA @ stdcall FileSaveMarkNotExistA(str str str) -# stdcall FileSaveMarkNotExistW(wstr wstr wstr) +@ stdcall FileSaveMarkNotExistW(wstr wstr wstr) @ stdcall FileSaveMarkNotExist(str str str) FileSaveMarkNotExistA @ stdcall FileSaveRestoreA(ptr str str str long) # stdcall FileSaveRestoreW(ptr wstr wstr wstr long) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index d5eccd9..287888c 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -724,6 +724,18 @@ done: /*********************************************************************** * FileSaveMarkNotExistA (ADVPACK.@) * + * See FileSaveMarkNotExistW. + */ +HRESULT WINAPI FileSaveMarkNotExistA(LPSTR pszFileList, LPSTR pszDir, LPSTR pszBaseName) +{ + TRACE("(%p, %p, %p)\n", pszFileList, pszDir, pszBaseName); + + return AddDelBackupEntryA(pszFileList, pszDir, pszBaseName, AADBE_DEL_ENTRY); +} + +/*********************************************************************** + * FileSaveMarkNotExistW (ADVPACK.@) + * * Marks the files in the file list as not existing so they won't be * backed up during a save. * @@ -736,11 +748,11 @@ done: * Success: S_OK. * Failure: E_FAIL. */ -HRESULT WINAPI FileSaveMarkNotExistA(LPSTR pszFileList, LPSTR pszDir, LPSTR pszBaseName) +HRESULT WINAPI FileSaveMarkNotExistW(LPWSTR pszFileList, LPWSTR pszDir, LPWSTR pszBaseName) { TRACE("(%p, %p, %p)\n", pszFileList, pszDir, pszBaseName); - return AddDelBackupEntryA(pszFileList, pszDir, pszBaseName, AADBE_DEL_ENTRY); + return AddDelBackupEntryW(pszFileList, pszDir, pszBaseName, AADBE_DEL_ENTRY); } /***********************************************************************

1 0

James Hawkins : advpack: Forward AdvInstallFileA to its Unicode counterpart .
by Alexandre Julliard March 23, 2006

March 23, 2006

Module: wine Branch: refs/heads/master Commit: cfbc26f3e679a409868363697d8ed39fb74b106f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cfbc26f3e679a4098683636… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Mar 22 14:34:41 2006 -0600 advpack: Forward AdvInstallFileA to its Unicode counterpart. --- dlls/advpack/advpack.spec | 2 + dlls/advpack/files.c | 78 +++++++++++++++++++++++++++++++++------------ 2 files changed, 58 insertions(+), 22 deletions(-) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index 7ab49b1..7481127 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -2,7 +2,7 @@ @ stdcall AddDelBackupEntryW(wstr wstr wstr long) @ stdcall AddDelBackupEntry(str str str long) AddDelBackupEntryA @ stdcall AdvInstallFileA(long str str str str long long) -# stdcall AdvInstallFileW(long wstr wstr wstr wstr long long) +@ stdcall AdvInstallFileW(long wstr wstr wstr wstr long long) @ stdcall AdvInstallFile(long str str str str long long) AdvInstallFileA @ stdcall CloseINFEngine(long) @ stdcall DelNodeA(str long) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index dbf6b66..d5eccd9 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -178,7 +178,7 @@ UINT CALLBACK pQueueCallback(PVOID Conte Notification == SPFILENOTIFY_DELETEERROR || Notification == SPFILENOTIFY_COPYERROR) { - return SetupDefaultQueueCallbackA(Context, Notification, + return SetupDefaultQueueCallbackW(Context, Notification, Param1, Param2); } @@ -188,6 +188,42 @@ UINT CALLBACK pQueueCallback(PVOID Conte /*********************************************************************** * AdvInstallFileA (ADVPACK.@) * + * See AdvInstallFileW. + */ +HRESULT WINAPI AdvInstallFileA(HWND hwnd, LPCSTR lpszSourceDir, LPCSTR lpszSourceFile, + LPCSTR lpszDestDir, LPCSTR lpszDestFile, + DWORD dwFlags, DWORD dwReserved) +{ + UNICODE_STRING sourcedir, sourcefile; + UNICODE_STRING destdir, destfile; + HRESULT res; + + TRACE("(%p,%s,%s,%s,%s,%ld,%ld)\n", hwnd, debugstr_a(lpszSourceDir), + debugstr_a(lpszSourceFile), debugstr_a(lpszDestDir), + debugstr_a(lpszDestFile), dwFlags, dwReserved); + + if (!lpszSourceDir || !lpszSourceFile || !lpszDestDir) + return E_INVALIDARG; + + RtlCreateUnicodeStringFromAsciiz(&sourcedir, lpszSourceDir); + RtlCreateUnicodeStringFromAsciiz(&sourcefile, lpszSourceFile); + RtlCreateUnicodeStringFromAsciiz(&destdir, lpszDestDir); + RtlCreateUnicodeStringFromAsciiz(&destfile, lpszDestFile); + + res = AdvInstallFileW(hwnd, sourcedir.Buffer, sourcefile.Buffer, + destdir.Buffer, destfile.Buffer, dwFlags, dwReserved); + + RtlFreeUnicodeString(&sourcedir); + RtlFreeUnicodeString(&sourcefile); + RtlFreeUnicodeString(&destdir); + RtlFreeUnicodeString(&destfile); + + return res; +} + +/*********************************************************************** + * AdvInstallFileW (ADVPACK.@) + * * Copies a file from the source to a destination. * * PARAMS @@ -207,20 +243,20 @@ UINT CALLBACK pQueueCallback(PVOID Conte * If lpszDestFile is NULL, the destination filename is the same as * lpszSourceFIle. */ -HRESULT WINAPI AdvInstallFileA(HWND hwnd, LPCSTR lpszSourceDir, LPCSTR lpszSourceFile, - LPCSTR lpszDestDir, LPCSTR lpszDestFile, - DWORD dwFlags, DWORD dwReserved) -{ - PSP_FILE_CALLBACK_A pFileCallback; - LPSTR szPath, szDestFilename; - char szRootPath[ROOT_LENGTH]; +HRESULT WINAPI AdvInstallFileW(HWND hwnd, LPCWSTR lpszSourceDir, LPCWSTR lpszSourceFile, + LPCWSTR lpszDestDir, LPCWSTR lpszDestFile, + DWORD dwFlags, DWORD dwReserved) +{ + PSP_FILE_CALLBACK_W pFileCallback; + LPWSTR szPath, szDestFilename; + WCHAR szRootPath[ROOT_LENGTH]; DWORD dwLen, dwLastError; HSPFILEQ fileQueue; PVOID pContext; - TRACE("(%p,%p,%p,%p,%p,%ld,%ld)\n", hwnd, debugstr_a(lpszSourceDir), - debugstr_a(lpszSourceFile), debugstr_a(lpszDestDir), - debugstr_a(lpszDestFile), dwFlags, dwReserved); + TRACE("(%p,%s,%s,%s,%s,%ld,%ld)\n", hwnd, debugstr_w(lpszSourceDir), + debugstr_w(lpszSourceFile), debugstr_w(lpszDestDir), + debugstr_w(lpszDestFile), dwFlags, dwReserved); if (!lpszSourceDir || !lpszSourceFile || !lpszDestDir) return E_INVALIDARG; @@ -232,25 +268,25 @@ HRESULT WINAPI AdvInstallFileA(HWND hwnd pContext = NULL; dwLastError = ERROR_SUCCESS; - lstrcpynA(szRootPath, lpszSourceDir, ROOT_LENGTH); - szPath = (LPSTR)lpszSourceDir + ROOT_LENGTH; + lstrcpynW(szRootPath, lpszSourceDir, ROOT_LENGTH); + szPath = (LPWSTR)lpszSourceDir + ROOT_LENGTH; /* use lpszSourceFile as destination filename if lpszDestFile is NULL */ if (lpszDestFile) { - dwLen = lstrlenA(lpszDestFile); - szDestFilename = HeapAlloc(GetProcessHeap(), 0, dwLen); - lstrcpyA(szDestFilename, lpszDestFile); + dwLen = lstrlenW(lpszDestFile); + szDestFilename = HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR)); + lstrcpyW(szDestFilename, lpszDestFile); } else { - dwLen = lstrlenA(lpszSourceFile); - szDestFilename = HeapAlloc(GetProcessHeap(), 0, dwLen); - lstrcpyA(szDestFilename, lpszSourceFile); + dwLen = lstrlenW(lpszSourceFile); + szDestFilename = HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR)); + lstrcpyW(szDestFilename, lpszSourceFile); } /* add the file copy operation to the setup queue */ - if (!SetupQueueCopyA(fileQueue, szRootPath, szPath, lpszSourceFile, NULL, + if (!SetupQueueCopyW(fileQueue, szRootPath, szPath, lpszSourceFile, NULL, NULL, lpszDestDir, szDestFilename, dwFlags)) { dwLastError = GetLastError(); @@ -272,7 +308,7 @@ HRESULT WINAPI AdvInstallFileA(HWND hwnd pFileCallback = pQueueCallback; /* perform the file copy */ - if (!SetupCommitFileQueueA(hwnd, fileQueue, pFileCallback, pContext)) + if (!SetupCommitFileQueueW(hwnd, fileQueue, pFileCallback, pContext)) { dwLastError = GetLastError(); goto done;

1 0

James Hawkins : advpack: Forward the ansi user stub APIs to their Unicode counterparts.
by Alexandre Julliard March 23, 2006

March 23, 2006

Module: wine Branch: refs/heads/master Commit: 72581bd2d73e357c2ca594a90b025f144b236553 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=72581bd2d73e357c2ca594a… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Mar 22 14:15:51 2006 -0600 advpack: Forward the ansi user stub APIs to their Unicode counterparts. --- dlls/advpack/advpack.c | 52 ++++++++++++++++++++++++++++++++++++++++++++- dlls/advpack/advpack.spec | 4 ++- 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index b4f3caf..18f33e4 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -683,10 +683,35 @@ HRESULT WINAPI TranslateInfStringExW(HIN /*********************************************************************** * UserInstStubWrapperA (ADVPACK.@) + * + * See UserInstStubWrapperW. */ HRESULT WINAPI UserInstStubWrapperA(HWND hWnd, HINSTANCE hInstance, LPSTR pszParms, INT nShow) { + UNICODE_STRING parmsW; + HRESULT res; + + TRACE("(%p, %p, %p, %i)\n", hWnd, hInstance, pszParms, nShow); + + if (!pszParms) + return E_INVALIDARG; + + RtlCreateUnicodeStringFromAsciiz(&parmsW, pszParms); + + res = UserInstStubWrapperW(hWnd, hInstance, parmsW.Buffer, nShow); + + RtlFreeUnicodeString(&parmsW); + + return res; +} + +/*********************************************************************** + * UserInstStubWrapperW (ADVPACK.@) + */ +HRESULT WINAPI UserInstStubWrapperW(HWND hWnd, HINSTANCE hInstance, + LPWSTR pszParms, INT nShow) +{ FIXME("(%p, %p, %p, %i) stub\n", hWnd, hInstance, pszParms, nShow); return E_FAIL; @@ -694,9 +719,34 @@ HRESULT WINAPI UserInstStubWrapperA(HWND /*********************************************************************** * UserUnInstStubWrapperA (ADVPACK.@) + * + * See UserUnInstStubWrapperW. */ HRESULT WINAPI UserUnInstStubWrapperA(HWND hWnd, HINSTANCE hInstance, - LPSTR pszParms, INT nShow) + LPSTR pszParms, INT nShow) +{ + UNICODE_STRING parmsW; + HRESULT res; + + TRACE("(%p, %p, %p, %i)\n", hWnd, hInstance, pszParms, nShow); + + if (!pszParms) + return E_INVALIDARG; + + RtlCreateUnicodeStringFromAsciiz(&parmsW, pszParms); + + res = UserUnInstStubWrapperW(hWnd, hInstance, parmsW.Buffer, nShow); + + RtlFreeUnicodeString(&parmsW); + + return res; +} + +/*********************************************************************** + * UserUnInstStubWrapperW (ADVPACK.@) + */ +HRESULT WINAPI UserUnInstStubWrapperW(HWND hWnd, HINSTANCE hInstance, + LPWSTR pszParms, INT nShow) { FIXME("(%p, %p, %p, %i) stub\n", hWnd, hInstance, pszParms, nShow); diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index aa90acf..7ab49b1 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -75,8 +75,8 @@ @ stdcall TranslateInfStringExW(long wstr wstr wstr wstr long ptr ptr) @ stdcall TranslateInfStringEx(long str str str str long ptr ptr) TranslateInfStringExA @ stdcall UserInstStubWrapperA(long long str long) -# stdcall UserInstStubWrapperW(long long wstr long) +@ stdcall UserInstStubWrapperW(long long wstr long) @ stdcall UserInstStubWrapper(long long str long) UserInstStubWrapperA @ stdcall UserUnInstStubWrapperA(long long str long) -# stdcall UserUnInstStubWrapperW(long long wstr long) +@ stdcall UserUnInstStubWrapperW(long long wstr long) @ stdcall UserUnInstStubWrapper(long long str long) UserUnInstStubWrapperA

1 0

James Hawkins : advpack: Forward AddDelBackupEntryA to its unicode counterpart.
by Alexandre Julliard March 23, 2006

March 23, 2006

Module: wine Branch: refs/heads/master Commit: ca3ad7d6dccf515bb245da41b7708d462ef30247 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ca3ad7d6dccf515bb245da4… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Mar 22 13:51:44 2006 -0600 advpack: Forward AddDelBackupEntryA to its unicode counterpart. --- dlls/advpack/advpack.spec | 2 - dlls/advpack/files.c | 91 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 77 insertions(+), 16 deletions(-) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index ae1d5b2..aa90acf 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -1,5 +1,5 @@ @ stdcall AddDelBackupEntryA(str str str long) -# stdcall AddDelBackupEntryW(wstr wstr wstr long) +@ stdcall AddDelBackupEntryW(wstr wstr wstr long) @ stdcall AddDelBackupEntry(str str str long) AddDelBackupEntryA @ stdcall AdvInstallFileA(long str str str str long long) # stdcall AdvInstallFileW(long wstr wstr wstr wstr long long) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 482b9ed..dbf6b66 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -26,15 +26,70 @@ #include "winuser.h" #include "winreg.h" #include "winver.h" +#include "winternl.h" #include "setupapi.h" #include "advpub.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(advpack); +/* converts an ansi double null-terminated list to a unicode list */ +static LPWSTR ansi_to_unicode_list(LPCSTR ansi_list) +{ + DWORD len, wlen = 0; + LPWSTR list; + LPCSTR ptr = ansi_list; + + while (*ptr) ptr += lstrlenA(ptr) + 1; + len = ptr + 1 - ansi_list; + wlen = MultiByteToWideChar(CP_ACP, 0, ansi_list, len, NULL, 0); + list = HeapAlloc(GetProcessHeap(), 0, wlen * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, ansi_list, len, list, wlen); + return list; +} + /*********************************************************************** * AddDelBackupEntryA (ADVPACK.@) * + * See AddDelBackupEntryW. + */ +HRESULT WINAPI AddDelBackupEntryA(LPCSTR lpcszFileList, LPCSTR lpcszBackupDir, + LPCSTR lpcszBaseName, DWORD dwFlags) +{ + UNICODE_STRING backupdir, basename; + LPWSTR filelist, backup; + HRESULT res; + + TRACE("(%p, %p, %p, %ld)\n", lpcszFileList, lpcszBackupDir, + lpcszBaseName, dwFlags); + + if (lpcszFileList) + filelist = ansi_to_unicode_list(lpcszFileList); + else + filelist = NULL; + + RtlCreateUnicodeStringFromAsciiz(&backupdir, lpcszBackupDir); + RtlCreateUnicodeStringFromAsciiz(&basename, lpcszBaseName); + + if (lpcszBackupDir) + backup = backupdir.Buffer; + else + backup = NULL; + + res = AddDelBackupEntryW(filelist, backup, basename.Buffer, dwFlags); + + HeapFree(GetProcessHeap(), 0, filelist); + + RtlFreeUnicodeString(&backupdir); + RtlFreeUnicodeString(&basename); + + return res; +} + +/*********************************************************************** + * AddDelBackupEntryW (ADVPACK.@) + * * Either appends the files in the file list to the backup section of * the specified INI, or deletes the entries from the INI file. * @@ -56,13 +111,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(advpack); * If lpcszBackupDir is NULL, the INI file is assumed to exist in * c:\windows or created there if it does not exist. */ -HRESULT WINAPI AddDelBackupEntryA(LPCSTR lpcszFileList, LPCSTR lpcszBackupDir, - LPCSTR lpcszBaseName, DWORD dwFlags) +HRESULT WINAPI AddDelBackupEntryW(LPCWSTR lpcszFileList, LPCWSTR lpcszBackupDir, + LPCWSTR lpcszBaseName, DWORD dwFlags) { - CHAR szIniPath[MAX_PATH]; - LPSTR szString = NULL; + WCHAR szIniPath[MAX_PATH]; + LPWSTR szString = NULL; - const char szBackupEntry[] = "-1,0,0,0,0,0,-1"; + static const WCHAR szBackupEntry[] = { + '-','1',',','0',',','0',',','0',',','0',',','0',',','-','1',0 + }; + + static const WCHAR backslash[] = {'\\',0}; + static const WCHAR ini[] = {'.','i','n','i',0}; + static const WCHAR backup[] = {'b','a','c','k','u','p',0}; TRACE("(%p, %p, %p, %ld)\n", lpcszFileList, lpcszBackupDir, lpcszBaseName, dwFlags); @@ -71,30 +132,30 @@ HRESULT WINAPI AddDelBackupEntryA(LPCSTR return S_OK; if (lpcszBackupDir) - lstrcpyA(szIniPath, lpcszBackupDir); + lstrcpyW(szIniPath, lpcszBackupDir); else - GetWindowsDirectoryA(szIniPath, MAX_PATH); + GetWindowsDirectoryW(szIniPath, MAX_PATH); - lstrcatA(szIniPath, "\\"); - lstrcatA(szIniPath, lpcszBaseName); - lstrcatA(szIniPath, ".ini"); + lstrcatW(szIniPath, backslash); + lstrcatW(szIniPath, lpcszBaseName); + lstrcatW(szIniPath, ini); - SetFileAttributesA(szIniPath, FILE_ATTRIBUTE_NORMAL); + SetFileAttributesW(szIniPath, FILE_ATTRIBUTE_NORMAL); if (dwFlags & AADBE_ADD_ENTRY) - szString = (LPSTR)szBackupEntry; + szString = (LPWSTR)szBackupEntry; else if (dwFlags & AADBE_DEL_ENTRY) szString = NULL; /* add or delete the INI entries */ while (*lpcszFileList) { - WritePrivateProfileStringA("backup", lpcszFileList, szString, szIniPath); - lpcszFileList += lstrlenA(lpcszFileList) + 1; + WritePrivateProfileStringW(backup, lpcszFileList, szString, szIniPath); + lpcszFileList += lstrlenW(lpcszFileList) + 1; } /* hide the INI file */ - SetFileAttributesA(szIniPath, FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN); + SetFileAttributesW(szIniPath, FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN); return S_OK; }

1 0

Alexandre Julliard : kernel: Remove a couple of incorrect asserts.
by Alexandre Julliard March 23, 2006

March 23, 2006

Module: wine Branch: refs/heads/master Commit: dc8e564f9e72c657bc3f97706eafc50d5dacad8a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dc8e564f9e72c657bc3f977… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 23 17:07:27 2006 +0100 kernel: Remove a couple of incorrect asserts. --- dlls/kernel/environ.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/kernel/environ.c b/dlls/kernel/environ.c index ecae8fe..424e02a 100644 --- a/dlls/kernel/environ.c +++ b/dlls/kernel/environ.c @@ -399,7 +399,6 @@ BOOL WINAPI SetStdHandle( DWORD std_hand */ VOID WINAPI GetStartupInfoA( LPSTARTUPINFOA info ) { - assert(startup_infoA.cb); memcpy(info, &startup_infoA, sizeof(startup_infoA)); } @@ -409,7 +408,6 @@ VOID WINAPI GetStartupInfoA( LPSTARTUPIN */ VOID WINAPI GetStartupInfoW( LPSTARTUPINFOW info ) { - assert(startup_infoW.cb); memcpy(info, &startup_infoW, sizeof(startup_infoW)); }

1 0

Rein Klazes : comctl32: Do not free LPSTR_TEXTCALLBACK tooltip texts.
by Alexandre Julliard March 23, 2006

March 23, 2006

Module: wine Branch: refs/heads/master Commit: 8b55e4a6621bef1fbd75909e2cfafd2270282aa5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8b55e4a6621bef1fbd75909… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Thu Mar 23 11:29:44 2006 +0100 comctl32: Do not free LPSTR_TEXTCALLBACK tooltip texts. --- dlls/comctl32/tooltips.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index c16fd7e..d730595 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -2025,7 +2025,8 @@ TOOLTIPS_SetToolInfoA (HWND hwnd, WPARAM else { if ( (toolPtr->lpszText) && !IS_INTRESOURCE(toolPtr->lpszText) ) { - Free (toolPtr->lpszText); + if( toolPtr->lpszText != LPSTR_TEXTCALLBACKW) + Free (toolPtr->lpszText); toolPtr->lpszText = NULL; } if (lpToolInfo->lpszText) { @@ -2082,7 +2083,8 @@ TOOLTIPS_SetToolInfoW (HWND hwnd, WPARAM else { if ( (toolPtr->lpszText) && !IS_INTRESOURCE(toolPtr->lpszText) ) { - Free (toolPtr->lpszText); + if( toolPtr->lpszText != LPSTR_TEXTCALLBACKW) + Free (toolPtr->lpszText); toolPtr->lpszText = NULL; } if (lpToolInfo->lpszText) { @@ -2208,7 +2210,8 @@ TOOLTIPS_UpdateTipTextA (HWND hwnd, WPAR else { if ( (toolPtr->lpszText) && !IS_INTRESOURCE(toolPtr->lpszText) ) { - Free (toolPtr->lpszText); + if( toolPtr->lpszText != LPSTR_TEXTCALLBACKW) + Free (toolPtr->lpszText); toolPtr->lpszText = NULL; } if (lpToolInfo->lpszText) { @@ -2265,7 +2268,8 @@ TOOLTIPS_UpdateTipTextW (HWND hwnd, WPAR else { if ( (toolPtr->lpszText) && !IS_INTRESOURCE(toolPtr->lpszText) ) { - Free (toolPtr->lpszText); + if( toolPtr->lpszText != LPSTR_TEXTCALLBACKW) + Free (toolPtr->lpszText); toolPtr->lpszText = NULL; } if (lpToolInfo->lpszText) {

1 0

Detlef Riekenberg : kernel: Load QueueUserWorkItem function dynamically.
by Alexandre Julliard March 23, 2006

March 23, 2006

Module: wine Branch: refs/heads/master Commit: 213cee62b598331143eb2c7f134bba9a30d7a552 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=213cee62b598331143eb2c7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Mar 22 23:34:52 2006 +0100 kernel: Load QueueUserWorkItem function dynamically. --- dlls/kernel/tests/thread.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/tests/thread.c b/dlls/kernel/tests/thread.c index 9788447..3a68175 100644 --- a/dlls/kernel/tests/thread.c +++ b/dlls/kernel/tests/thread.c @@ -58,6 +58,9 @@ static GetThreadPriorityBoost_t pGetThre typedef HANDLE (WINAPI *OpenThread_t)(DWORD,BOOL,DWORD); static OpenThread_t pOpenThread=NULL; +typedef BOOL (WINAPI *QueueUserWorkItem_t)(LPTHREAD_START_ROUTINE,PVOID,ULONG); +static QueueUserWorkItem_t pQueueUserWorkItem=NULL; + typedef DWORD (WINAPI *SetThreadIdealProcessor_t)(HANDLE,DWORD); static SetThreadIdealProcessor_t pSetThreadIdealProcessor=NULL; @@ -695,13 +698,16 @@ static void test_QueueUserWorkItem(void) DWORD wait_result; DWORD before, after; + /* QueueUserWorkItem not present on win9x */ + if (!pQueueUserWorkItem) return; + finish_event = CreateEvent(NULL, TRUE, FALSE, NULL); before = GetTickCount(); for (i = 0; i < 100; i++) { - BOOL ret = QueueUserWorkItem(work_function, (void *)i, WT_EXECUTEDEFAULT); + BOOL ret = pQueueUserWorkItem(work_function, (void *)i, WT_EXECUTEDEFAULT); ok(ret, "QueueUserWorkItem failed with error %ld\n", GetLastError()); } @@ -724,6 +730,7 @@ START_TEST(thread) ok(lib!=NULL,"Couldn't get a handle for kernel32.dll\n"); pGetThreadPriorityBoost=(GetThreadPriorityBoost_t)GetProcAddress(lib,"GetThreadPriorityBoost"); pOpenThread=(OpenThread_t)GetProcAddress(lib,"OpenThread"); + pQueueUserWorkItem=(QueueUserWorkItem_t)GetProcAddress(lib,"QueueUserWorkItem"); pSetThreadIdealProcessor=(SetThreadIdealProcessor_t)GetProcAddress(lib,"SetThreadIdealProcessor"); pSetThreadPriorityBoost=(SetThreadPriorityBoost_t)GetProcAddress(lib,"SetThreadPriorityBoost"); test_CreateThread_basic();

1 0

Eric Kohl : widl: Fix base type alignments.
by Alexandre Julliard March 23, 2006

March 23, 2006

Module: wine Branch: refs/heads/master Commit: 6ad46cc96175ecfa8640cba294e5a72037a7bc68 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6ad46cc96175ecfa8640cba… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Thu Mar 23 10:39:07 2006 +0100 widl: Fix base type alignments. Generate aligned marshal and unmarshal code for base type arguments and return values. --- tools/widl/server.c | 4 ++++ tools/widl/typegen.c | 29 +++++++++-------------------- 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/tools/widl/server.c b/tools/widl/server.c index 1b134f3..42aedff 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -306,6 +306,10 @@ static void write_function_stubs(type_t /* marshall the return value */ if (!is_void(def->type, NULL)) { + unsigned int alignment; + unsigned int size = get_required_buffer_size(def, &alignment); + print_server("_StubMsg.Buffer += (unsigned char *)(((long)_StubMsg.Buffer + %u) & ~0x%x);\n", + size - 1, size - 1); print_server("*("); write_type(server, def->type, def, def->tname); fprintf(server, " *)_StubMsg.Buffer = _RetVal;\n"); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index fd2d040..8127b6a 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1285,12 +1285,13 @@ static unsigned int get_required_buffer_ case RPC_FC_CHAR: case RPC_FC_USMALL: case RPC_FC_SMALL: + *alignment = 4; return 1; case RPC_FC_WCHAR: case RPC_FC_USHORT: case RPC_FC_SHORT: - *alignment = 2; + *alignment = 4; return 2; case RPC_FC_ULONG: @@ -1358,7 +1359,6 @@ void write_remoting_arguments(FILE *file unsigned int *type_offset, enum pass pass, enum remoting_phase phase) { - unsigned int last_size = 0; var_t *var; if (!func->args) @@ -1398,7 +1398,6 @@ void write_remoting_arguments(FILE *file print_file(file, indent, "NdrConformantString%s(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d]);\n", function_from_phase(phase), var->name, *type_offset); - last_size = 1; } else if (is_array_type(var->attrs, var->ptr_level, var->array)) { @@ -1455,7 +1454,6 @@ void write_remoting_arguments(FILE *file "Ndr%s%s(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d]);\n", array_type, function_from_phase(phase), var->name, *type_offset); - last_size = 1; } else if (var->ptr_level == 0 && is_base_type(var->type->type)) { @@ -1468,15 +1466,14 @@ void write_remoting_arguments(FILE *file case RPC_FC_SMALL: case RPC_FC_USMALL: size = 1; - alignment = 0; + alignment = 1; break; case RPC_FC_WCHAR: case RPC_FC_USHORT: case RPC_FC_SHORT: size = 2; - if (last_size != 0 && last_size < 2) - alignment = (2 - last_size); + alignment = 2; break; case RPC_FC_ULONG: @@ -1484,15 +1481,13 @@ void write_remoting_arguments(FILE *file case RPC_FC_FLOAT: case RPC_FC_ERROR_STATUS_T: size = 4; - if (last_size != 0 && last_size < 4) - alignment = (4 - last_size); + alignment = 4; break; case RPC_FC_HYPER: case RPC_FC_DOUBLE: size = 8; - if (last_size != 0 && last_size < 4) - alignment = (4 - last_size); + alignment = 8; break; case RPC_FC_IGNORE: @@ -1505,8 +1500,8 @@ void write_remoting_arguments(FILE *file size = 0; } - if (alignment != 0) - print_file(file, indent, "_StubMsg.Buffer += %u;\n", alignment); + print_file(file, indent, "_StubMsg.Buffer += (unsigned char *)(((long)_StubMsg.Buffer + %u) & ~0x%x);\n", + alignment - 1, alignment - 1); if (phase == PHASE_MARSHAL) { @@ -1523,17 +1518,13 @@ void write_remoting_arguments(FILE *file fprintf(file, " = *("); write_type(file, var->type, var, var->tname); fprintf(file, " *)_StubMsg.Buffer;\n"); - print_file(file, indent, "_StubMsg.Buffer += sizeof("); - write_type(file, var->type, var, var->tname); - fprintf(file, ");\n"); } else error("write_remoting_arguments: Unimplemented for base types for phase %d\n", phase); + print_file(file, indent, "_StubMsg.Buffer += sizeof("); write_type(file, var->type, var, var->tname); fprintf(file, ");\n"); - - last_size = size; } else if (var->ptr_level == 0) { @@ -1563,14 +1554,12 @@ void write_remoting_arguments(FILE *file print_file(file, indent, "Ndr%s%s(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d]);\n", ndrtype, function_from_phase(phase), var->name, *type_offset); - last_size = 1; } else { print_file(file, indent, "NdrPointer%s(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d]);\n", function_from_phase(phase), var->name, *type_offset); - last_size = 1; } fprintf(file, "\n"); }

1 0