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

Dmitry Timoshkov : fonts: Use pixels instead of logical units for " Small Fonts" bitmap font metrics.
by Alexandre Julliard April 4, 2006

April 4, 2006

Module: wine Branch: refs/heads/master Commit: c925703e3db14c03f15c6202f1d9a61fc2bbe112 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c925703e3db14c03f15c620… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Apr 4 18:56:00 2006 +0900 fonts: Use pixels instead of logical units for "Small Fonts" bitmap font metrics. --- fonts/small_fonts.sfd | 755 +++++++++++++++++++++++++++---------------------- 1 files changed, 422 insertions(+), 333 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=c925703e3db14c03f15…

1 0

Augusto Arcoverde da Rocha : x11drv: Fixed handling of XK_KP_Separator.
by Alexandre Julliard April 4, 2006

April 4, 2006

Module: wine Branch: refs/heads/master Commit: d5d878f23221cf20250cda1327f77edfe91dacd1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d5d878f23221cf20250cda1… Author: Augusto Arcoverde da Rocha <agarobr.listas(a)gmail.com> Date: Thu Mar 9 18:05:07 2006 -0300 x11drv: Fixed handling of XK_KP_Separator. --- dlls/x11drv/keyboard.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/x11drv/keyboard.c b/dlls/x11drv/keyboard.c index 202bff9..d9d843a 100644 --- a/dlls/x11drv/keyboard.c +++ b/dlls/x11drv/keyboard.c @@ -1059,7 +1059,7 @@ static const WORD nonchar_key_scan[256] 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x4B, 0x48, /* FF90 */ 0x4D, 0x50, 0x49, 0x51, 0x4F, 0x4C, 0x52, 0x53, /* FF98 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FFA0 */ - 0x00, 0x00, 0x37, 0x4E, /*?*/ 0, 0x4A, 0x53, 0x135, /* FFA8 */ + 0x00, 0x00, 0x37, 0x4E, 0x53, 0x4A, 0x53, 0x135, /* FFA8 */ 0x52, 0x4F, 0x50, 0x51, 0x4B, 0x4C, 0x4D, 0x47, /* FFB0 */ 0x48, 0x49, 0x00, 0x00, 0x00, 0x00, /* FFB8 */ /* function keys */ @@ -1089,8 +1089,9 @@ static WORD EVENT_event_to_vkey( XIC xic else XLookupString(e, buf, sizeof(buf), &keysym, NULL); - if ((keysym >= 0xFFAE) && (keysym <= 0xFFB9) && (keysym != 0xFFAF) - && (e->state & NumLockMask)) + if ((e->state & NumLockMask) && + (keysym == XK_KP_Separator || keysym == XK_KP_Decimal || + (keysym >= XK_KP_0 && keysym <= XK_KP_9))) /* Only the Keypad keys 0-9 and . send different keysyms * depending on the NumLock state */ return nonchar_key_vkey[keysym & 0xFF]; @@ -2377,6 +2378,9 @@ INT X11DRV_ToUnicodeEx(UINT virtKey, UIN if (virtKey==VK_DECIMAL) e.keycode = XKeysymToKeycode(e.display, XK_KP_Decimal); + if (virtKey==VK_SEPARATOR) + e.keycode = XKeysymToKeycode(e.display, XK_KP_Separator); + if (!e.keycode && virtKey != VK_NONAME) { WARN("Unknown virtual key %X !!!\n", virtKey);

1 0

James Hawkins : advpack: Forward RegInstallA to its Unicode counterpart.
by Alexandre Julliard April 4, 2006

April 4, 2006

Module: wine Branch: refs/heads/master Commit: e475634799800f56c1e4f58d6b6fea3f6df5d115 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e475634799800f56c1e4f58… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Apr 3 12:04:46 2006 -0500 advpack: Forward RegInstallA to its Unicode counterpart. --- dlls/advpack/advpack.spec | 2 - dlls/advpack/reg.c | 104 ++++++++++++++++++++++++++++++++++++--------- 2 files changed, 84 insertions(+), 22 deletions(-) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index 1728537..f94146c 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -50,7 +50,7 @@ @ stdcall RebootCheckOnInstallW(long wstr wstr long) @ stdcall RebootCheckOnInstall(long str str long) RebootCheckOnInstallA @ stdcall RegInstallA(ptr str ptr) -# stdcall RegInstallW(ptr wstr ptr) +@ stdcall RegInstallW(ptr wstr ptr) @ stdcall RegInstall(ptr str ptr) RegInstallA @ stdcall RegRestoreAllA(ptr str long) @ stdcall RegRestoreAllW(ptr wstr long) diff --git a/dlls/advpack/reg.c b/dlls/advpack/reg.c index 7784dc7..854cff3 100644 --- a/dlls/advpack/reg.c +++ b/dlls/advpack/reg.c @@ -97,9 +97,82 @@ error: return FALSE; } +static void strentry_atow(STRENTRYA *aentry, STRENTRYW *wentry) +{ + DWORD name_len, val_len; + + name_len = MultiByteToWideChar(CP_ACP, 0, aentry->pszName, -1, NULL, 0); + val_len = MultiByteToWideChar(CP_ACP, 0, aentry->pszName, -1, NULL, 0); + + wentry->pszName = HeapAlloc(GetProcessHeap(), 0, name_len * sizeof(WCHAR)); + wentry->pszValue = HeapAlloc(GetProcessHeap(), 0, val_len * sizeof(WCHAR)); + + MultiByteToWideChar(CP_ACP, 0, aentry->pszName, -1, wentry->pszName, name_len); + MultiByteToWideChar(CP_ACP, 0, aentry->pszName, -1, wentry->pszValue, val_len); +} + +static STRTABLEW *strtable_atow(const STRTABLEA *atable) +{ + STRTABLEW *wtable; + DWORD j; + + wtable = HeapAlloc(GetProcessHeap(), 0, sizeof(STRTABLEW)); + wtable->pse = HeapAlloc(GetProcessHeap(), 0, atable->cEntries * sizeof(STRENTRYW)); + wtable->cEntries = atable->cEntries; + + for (j = 0; j < wtable->cEntries; j++) + strentry_atow(&atable->pse[j], &wtable->pse[j]); + + return wtable; +} + +static void free_strtable(STRTABLEW *wtable) +{ + DWORD j; + + for (j = 0; j < wtable->cEntries; j++) + { + HeapFree(GetProcessHeap(), 0, wtable->pse[j].pszName); + HeapFree(GetProcessHeap(), 0, wtable->pse[j].pszValue); + } + + HeapFree(GetProcessHeap(), 0, wtable->pse); + HeapFree(GetProcessHeap(), 0, wtable); +} + /*********************************************************************** * RegInstallA (advpack.@) * + * See RegInstallW. + */ +HRESULT WINAPI RegInstallA(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable) +{ + UNICODE_STRING section; + STRTABLEW *wtable; + HRESULT hr; + + TRACE("(%p, %s, %p)\n", hm, debugstr_a(pszSection), pstTable); + + if (pstTable) + wtable = strtable_atow(pstTable); + else + wtable = NULL; + + RtlCreateUnicodeStringFromAsciiz(&section, pszSection); + + hr = RegInstallW(hm, section.Buffer, wtable); + + if (pstTable) + free_strtable(wtable); + + RtlFreeUnicodeString(&section); + + return hr; +} + +/*********************************************************************** + * RegInstallW (advpack.@) + * * Loads an INF from a string resource, adds entries to the string * substitution table, and executes the INF. * @@ -112,20 +185,15 @@ error: * Success: S_OK. * Failure: E_FAIL. */ -HRESULT WINAPI RegInstallA(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable) +HRESULT WINAPI RegInstallW(HMODULE hm, LPCWSTR pszSection, const STRTABLEW* pstTable) { int i; WCHAR tmp_ini_path[MAX_PATH]; WCHAR mod_path[MAX_PATH + 2], sys_mod_path[MAX_PATH + 2], sys_root[MAX_PATH]; HINF hinf; - WCHAR quote[] = {'\"',0}; - UNICODE_STRING section; - - TRACE("(%p %s %p)\n", hm, pszSection, pstTable); + static const WCHAR quote[] = {'\"',0}; - if (pstTable) for(i = 0; i < pstTable->cEntries; i++) - TRACE("%d: %s -> %s\n", i, pstTable->pse[i].pszName, - pstTable->pse[i].pszValue); + TRACE("(%p, %s, %p)\n", hm, debugstr_w(pszSection), pstTable); if(!create_tmp_ini_file(hm, tmp_ini_path)) return E_FAIL; @@ -150,16 +218,13 @@ HRESULT WINAPI RegInstallA(HMODULE hm, L /* Write the additional string table */ if (pstTable) for(i = 0; i < pstTable->cEntries; i++) { - char tmp_value[MAX_PATH + 2]; - UNICODE_STRING name, value; + WCHAR tmp_value[MAX_PATH + 2]; + tmp_value[0] = '\"'; - strcpy(tmp_value + 1, pstTable->pse[i].pszValue); - strcat(tmp_value, "\""); - RtlCreateUnicodeStringFromAsciiz(&name, pstTable->pse[i].pszName); - RtlCreateUnicodeStringFromAsciiz(&value, tmp_value); - WritePrivateProfileStringW(Strings, name.Buffer, value.Buffer, tmp_ini_path); - RtlFreeUnicodeString(&name); - RtlFreeUnicodeString(&value); + lstrcpyW(tmp_value + 1, pstTable->pse[i].pszValue); + lstrcatW(tmp_value, quote); + + WritePrivateProfileStringW(Strings, pstTable->pse[i].pszName, tmp_value, tmp_ini_path); } /* flush cache */ WritePrivateProfileStringW(NULL, NULL, NULL, tmp_ini_path); @@ -175,12 +240,9 @@ HRESULT WINAPI RegInstallA(HMODULE hm, L SetupOpenAppendInfFileW(NULL, hinf, NULL); /* Need to do a lot more here */ - RtlCreateUnicodeStringFromAsciiz(&section, pszSection); - SetupInstallFromInfSectionW(NULL, hinf, section.Buffer, + SetupInstallFromInfSectionW(NULL, hinf, pszSection, SPINST_INIFILES | SPINST_REGISTRY | SPINST_PROFILEITEMS, HKEY_LOCAL_MACHINE, NULL, 0, NULL, NULL, NULL, NULL); - RtlFreeUnicodeString(&section); - SetupCloseInfFile(hinf); DeleteFileW(tmp_ini_path);

1 0

James Hawkins : advpack: Forward LaunchINFSectionA to its Unicode counterpart.
by Alexandre Julliard April 4, 2006

April 4, 2006

Module: wine Branch: refs/heads/master Commit: 39cedf0bedf785d38e96a26e27b07db924776b3f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=39cedf0bedf785d38e96a26… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Apr 3 12:04:59 2006 -0500 advpack: Forward LaunchINFSectionA to its Unicode counterpart. --- dlls/advpack/advpack.spec | 2 +- dlls/advpack/install.c | 25 +++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index 7dd0bb4..1728537 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -36,7 +36,7 @@ @ stdcall GetVersionFromFileEx(str ptr ptr long) GetVersionFromFileExA @ stdcall IsNTAdmin(long ptr) @ stdcall LaunchINFSectionA(ptr ptr str long) -# stdcall LaunchINFSectionW(ptr ptr wstr long) +@ stdcall LaunchINFSectionW(ptr ptr wstr long) @ stdcall LaunchINFSection(ptr ptr str long) LaunchINFSectionA @ stdcall LaunchINFSectionExA(ptr ptr str long) @ stdcall LaunchINFSectionExW(ptr ptr wstr long) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 80ed36e..c8ce340 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -156,6 +156,27 @@ HRESULT WINAPI ExecuteCabW(HWND hwnd, CA /*********************************************************************** * LaunchINFSectionA (ADVPACK.@) * + * See LaunchINFSectionW. + */ +INT WINAPI LaunchINFSectionA(HWND hWnd, HINSTANCE hInst, LPSTR cmdline, INT show) +{ + UNICODE_STRING cmd; + HRESULT hr; + + TRACE("(%p, %p, %s, %d)\n", hWnd, hInst, debugstr_a(cmdline), show); + + RtlCreateUnicodeStringFromAsciiz(&cmd, cmdline); + + hr = LaunchINFSectionW(hWnd, hInst, cmd.Buffer, show); + + RtlFreeUnicodeString(&cmd); + + return hr; +} + +/*********************************************************************** + * LaunchINFSectionW (ADVPACK.@) + * * Installs an INF section without BACKUP/ROLLBACK capabilities. * * PARAMS @@ -180,9 +201,9 @@ HRESULT WINAPI ExecuteCabW(HWND hwnd, CA * BUGS * Unimplemented. */ -INT WINAPI LaunchINFSectionA( HWND hWnd, HINSTANCE hInst, LPSTR cmdline, INT show ) +INT WINAPI LaunchINFSectionW(HWND hWnd, HINSTANCE hInst, LPWSTR cmdline, INT show) { - FIXME("(%p %p %s %d): stub\n", hWnd, hInst, debugstr_a(cmdline), show ); + FIXME("(%p, %p, %s, %d): stub\n", hWnd, hInst, debugstr_w(cmdline), show); return 0; }

1 0

James Hawkins : advpack: Forward RegSaveRestoreOnINFA to its Unicode counterpart.
by Alexandre Julliard April 4, 2006

April 4, 2006

Module: wine Branch: refs/heads/master Commit: 844eebd0e764901117f79c0e0dd6bdf828bba3ce URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=844eebd0e764901117f79c0… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Apr 3 12:04:32 2006 -0500 advpack: Forward RegSaveRestoreOnINFA to its Unicode counterpart. --- dlls/advpack/advpack.spec | 2 +- dlls/advpack/reg.c | 35 ++++++++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index 5964403..7dd0bb4 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -59,7 +59,7 @@ @ stdcall RegSaveRestoreW(ptr wstr long wstr wstr wstr long) @ stdcall RegSaveRestore(ptr str long str str str long) RegSaveRestoreA @ stdcall RegSaveRestoreOnINFA(ptr str str str long long long) -# stdcall RegSaveRestoreOnINFW(ptr wstr wstr wstr long long long) +@ stdcall RegSaveRestoreOnINFW(ptr wstr wstr wstr long long long) @ stdcall RegSaveRestoreOnINF(ptr str str str long long long) RegSaveRestoreOnINFA @ stdcall RegisterOCX(ptr ptr str long) @ stdcall RunSetupCommandA(long str str str str ptr long ptr) diff --git a/dlls/advpack/reg.c b/dlls/advpack/reg.c index 270a9df..7784dc7 100644 --- a/dlls/advpack/reg.c +++ b/dlls/advpack/reg.c @@ -298,6 +298,35 @@ HRESULT WINAPI RegSaveRestoreW(HWND hWnd /*********************************************************************** * RegSaveRestoreOnINFA (advpack.@) * + * See RegSaveRestoreOnINFW. + */ +HRESULT WINAPI RegSaveRestoreOnINFA(HWND hWnd, LPCSTR pszTitle, LPCSTR pszINF, + LPCSTR pszSection, HKEY hHKLMBackKey, + HKEY hHKCUBackKey, DWORD dwFlags) +{ + UNICODE_STRING title, inf, section; + HRESULT hr; + + TRACE("(%p, %p, %p, %p, %p, %p, %ld)\n", hWnd, pszTitle, pszINF, + pszSection, hHKLMBackKey, hHKCUBackKey, dwFlags); + + RtlCreateUnicodeStringFromAsciiz(&title, pszTitle); + RtlCreateUnicodeStringFromAsciiz(&inf, pszINF); + RtlCreateUnicodeStringFromAsciiz(&section, pszSection); + + hr = RegSaveRestoreOnINFW(hWnd, title.Buffer, inf.Buffer, section.Buffer, + hHKLMBackKey, hHKCUBackKey, dwFlags); + + RtlFreeUnicodeString(&title); + RtlFreeUnicodeString(&inf); + RtlFreeUnicodeString(&section); + + return hr; +} + +/*********************************************************************** + * RegSaveRestoreOnINFW (advpack.@) + * * Saves or restores the specified INF Reg section. * * PARAMS @@ -316,9 +345,9 @@ HRESULT WINAPI RegSaveRestoreW(HWND hWnd * BUGS * Unimplemented. */ -HRESULT WINAPI RegSaveRestoreOnINFA(HWND hWnd, LPCSTR pszTitle, LPCSTR pszINF, - LPCSTR pszSection, HKEY hHKLMBackKey, - HKEY hHKCUBackKey, DWORD dwFlags) +HRESULT WINAPI RegSaveRestoreOnINFW(HWND hWnd, LPCWSTR pszTitle, LPCWSTR pszINF, + LPCWSTR pszSection, HKEY hHKLMBackKey, + HKEY hHKCUBackKey, DWORD dwFlags) { FIXME("(%p, %p, %p, %p, %p, %p, %ld) stub\n", hWnd, pszTitle, pszINF, pszSection, hHKLMBackKey, hHKCUBackKey, dwFlags);

1 0

James Hawkins : advpack: Forward RegSaveRestoreA to its Unicode counterpart .
by Alexandre Julliard April 4, 2006

April 4, 2006

Module: wine Branch: refs/heads/master Commit: 96a428066ad04b0bbf0f7fc46d0466a525bb2804 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=96a428066ad04b0bbf0f7fc… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Apr 3 12:04:21 2006 -0500 advpack: Forward RegSaveRestoreA to its Unicode counterpart. --- dlls/advpack/advpack.spec | 2 +- dlls/advpack/reg.c | 37 ++++++++++++++++++++++++++++++++++--- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index 5889c92..5964403 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -56,7 +56,7 @@ @ stdcall RegRestoreAllW(ptr wstr long) @ stdcall RegRestoreAll(ptr str long) RegRestoreAllA @ stdcall RegSaveRestoreA(ptr str long str str str long) -# stdcall RegSaveRestoreW(ptr wstr long wstr wstr wstr long) +@ stdcall RegSaveRestoreW(ptr wstr long wstr wstr wstr long) @ stdcall RegSaveRestore(ptr str long str str str long) RegSaveRestoreA @ stdcall RegSaveRestoreOnINFA(ptr str str str long long long) # stdcall RegSaveRestoreOnINFW(ptr wstr wstr wstr long long long) diff --git a/dlls/advpack/reg.c b/dlls/advpack/reg.c index 546d249..270a9df 100644 --- a/dlls/advpack/reg.c +++ b/dlls/advpack/reg.c @@ -236,6 +236,37 @@ HRESULT WINAPI RegRestoreAllW(HWND hWnd, /*********************************************************************** * RegSaveRestoreA (advpack.@) * + * See RegSaveRestoreW. + */ +HRESULT WINAPI RegSaveRestoreA(HWND hWnd, LPCSTR pszTitleString, HKEY hkBackupKey, + LPCSTR pcszRootKey, LPCSTR pcszSubKey, + LPCSTR pcszValueName, DWORD dwFlags) +{ + UNICODE_STRING title, root, subkey, value; + HRESULT hr; + + TRACE("(%p, %p, %p, %p, %p, %p, %ld)\n", hWnd, pszTitleString, + hkBackupKey, pcszRootKey, pcszSubKey, pcszValueName, dwFlags); + + RtlCreateUnicodeStringFromAsciiz(&title, pszTitleString); + RtlCreateUnicodeStringFromAsciiz(&root, pcszRootKey); + RtlCreateUnicodeStringFromAsciiz(&subkey, pcszSubKey); + RtlCreateUnicodeStringFromAsciiz(&value, pcszValueName); + + hr = RegSaveRestoreW(hWnd, title.Buffer, hkBackupKey, root.Buffer, + subkey.Buffer, value.Buffer, dwFlags); + + RtlFreeUnicodeString(&title); + RtlFreeUnicodeString(&root); + RtlFreeUnicodeString(&subkey); + RtlFreeUnicodeString(&value); + + return hr; +} + +/*********************************************************************** + * RegSaveRestoreW (advpack.@) + * * Saves or restores the specified registry value. * * PARAMS @@ -254,9 +285,9 @@ HRESULT WINAPI RegRestoreAllW(HWND hWnd, * BUGS * Unimplemented. */ -HRESULT WINAPI RegSaveRestoreA(HWND hWnd, LPCSTR pszTitleString, HKEY hkBackupKey, - LPCSTR pcszRootKey, LPCSTR pcszSubKey, - LPCSTR pcszValueName, DWORD dwFlags) +HRESULT WINAPI RegSaveRestoreW(HWND hWnd, LPCWSTR pszTitleString, HKEY hkBackupKey, + LPCWSTR pcszRootKey, LPCWSTR pcszSubKey, + LPCWSTR pcszValueName, DWORD dwFlags) { FIXME("(%p, %p, %p, %p, %p, %p, %ld) stub\n", hWnd, pszTitleString, hkBackupKey, pcszRootKey, pcszSubKey, pcszValueName, dwFlags);

1 0

James Hawkins : advpack: Forward RegRestoreAllA to its Unicode counterpart.
by Alexandre Julliard April 4, 2006

April 4, 2006

Module: wine Branch: refs/heads/master Commit: 063a36b66f6d0b98f37f1fb5a69549a21101ce2f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=063a36b66f6d0b98f37f1fb… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Apr 3 12:03:58 2006 -0500 advpack: Forward RegRestoreAllA to its Unicode counterpart. --- dlls/advpack/advpack.spec | 2 +- dlls/advpack/reg.c | 25 +++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index f6a85c7..5889c92 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -53,7 +53,7 @@ # stdcall RegInstallW(ptr wstr ptr) @ stdcall RegInstall(ptr str ptr) RegInstallA @ stdcall RegRestoreAllA(ptr str long) -# stdcall RegRestoreAllW(ptr wstr long) +@ stdcall RegRestoreAllW(ptr wstr long) @ stdcall RegRestoreAll(ptr str long) RegRestoreAllA @ stdcall RegSaveRestoreA(ptr str long str str str long) # stdcall RegSaveRestoreW(ptr wstr long wstr wstr wstr long) diff --git a/dlls/advpack/reg.c b/dlls/advpack/reg.c index 921dc1b..546d249 100644 --- a/dlls/advpack/reg.c +++ b/dlls/advpack/reg.c @@ -191,6 +191,27 @@ HRESULT WINAPI RegInstallA(HMODULE hm, L /*********************************************************************** * RegRestoreAllA (advpack.@) * + * See RegRestoreAllW. + */ +HRESULT WINAPI RegRestoreAllA(HWND hWnd, LPSTR pszTitleString, HKEY hkBackupKey) +{ + UNICODE_STRING title; + HRESULT hr; + + TRACE("(%p, %s, %p)\n", hWnd, pszTitleString, hkBackupKey); + + RtlCreateUnicodeStringFromAsciiz(&title, pszTitleString); + + hr = RegRestoreAllW(hWnd, title.Buffer, hkBackupKey); + + RtlFreeUnicodeString(&title); + + return hr; +} + +/*********************************************************************** + * RegRestoreAllW (advpack.@) + * * Restores all saved registry entries. * * PARAMS @@ -205,9 +226,9 @@ HRESULT WINAPI RegInstallA(HMODULE hm, L * BUGS * Unimplemented. */ -HRESULT WINAPI RegRestoreAllA(HWND hWnd, LPSTR pszTitleString, HKEY hkBackupKey) +HRESULT WINAPI RegRestoreAllW(HWND hWnd, LPWSTR pszTitleString, HKEY hkBackupKey) { - FIXME("(%p, %p, %p) stub\n", hWnd, pszTitleString, hkBackupKey); + FIXME("(%p, %s, %p) stub\n", hWnd, debugstr_w(pszTitleString), hkBackupKey); return E_FAIL; }

1 0

Jason Green : wined3d: Add a couple more debugging output formats.
by Alexandre Julliard April 4, 2006

April 4, 2006

Module: wine Branch: refs/heads/master Commit: bb704ea9513845d2991f3d1a1e89258e8eb183cf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bb704ea9513845d2991f3d1… Author: Jason Green <jave27(a)gmail.com> Date: Mon Apr 3 11:01:19 2006 -0400 wined3d: Add a couple more debugging output formats. --- dlls/wined3d/utils.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index fab8559..e9f6366 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -45,6 +45,8 @@ const char* debug_d3dformat(WINED3DFORMA FMT_TO_STR(WINED3DFMT_A8); FMT_TO_STR(WINED3DFMT_A8R3G3B2); FMT_TO_STR(WINED3DFMT_X4R4G4B4); + FMT_TO_STR(WINED3DFMT_A2B10G10R10); + FMT_TO_STR(WINED3DFMT_X8B8G8R8); FMT_TO_STR(WINED3DFMT_G16R16); FMT_TO_STR(WINED3DFMT_A2R10G10B10); FMT_TO_STR(WINED3DFMT_A16B16G16R16);

1 0

Alexandre Julliard : configure: Filter out garbage from arts-config --libs too.
by Alexandre Julliard April 4, 2006

April 4, 2006

Module: wine Branch: refs/heads/master Commit: 197a7d0422b2dd60009e405bc254ca616327fbf0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=197a7d0422b2dd60009e405… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 4 12:08:30 2006 +0200 configure: Filter out garbage from arts-config --libs too. --- configure | 9 ++++++++- configure.ac | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 9bffafd..c825171 100755 --- a/configure +++ b/configure @@ -10855,7 +10855,14 @@ then -I*) ARTSC_CFLAGS="$ARTSC_CFLAGS $i";; esac done - ARTSC_LIBS=`$ARTSCCONFIG --libs` + ARTSC_LIBS="" + for i in `$ARTSCCONFIG --libs` + do + case "$i" in + -L/usr/lib|-L/usr/lib64) ;; + -L*|-l*) ARTSC_LIBS="$ARTSC_LIBS $i";; + esac + done save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $ARTSC_CFLAGS" echo "$as_me:$LINENO: checking for arts_init in -lartsc" >&5 diff --git a/configure.ac b/configure.ac index afcc222..8089836 100644 --- a/configure.ac +++ b/configure.ac @@ -711,7 +711,14 @@ then -I*) ARTSC_CFLAGS="$ARTSC_CFLAGS $i";; esac done - ARTSC_LIBS=`$ARTSCCONFIG --libs` + ARTSC_LIBS="" + for i in `$ARTSCCONFIG --libs` + do + case "$i" in + -L/usr/lib|-L/usr/lib64) ;; + -L*|-l*) ARTSC_LIBS="$ARTSC_LIBS $i";; + esac + done save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $ARTSC_CFLAGS" AC_CHECK_LIB(artsc,arts_init,

1 0

Mike Hearn : kernel: Don' t enforce process handle access rights in Win98 mode.
by Alexandre Julliard April 4, 2006

April 4, 2006

Module: wine Branch: refs/heads/master Commit: ef7fce84900d8366f3cdd46104ebf430710b10b9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ef7fce84900d8366f3cdd46… Author: Mike Hearn <mh(a)codeweavers.com> Date: Fri Mar 31 14:02:05 2006 +0100 kernel: Don't enforce process handle access rights in Win98 mode. --- dlls/kernel/process.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index 7b9b328..5b5842d 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -2271,6 +2271,8 @@ HANDLE WINAPI OpenProcess( DWORD access, attr.SecurityQualityOfService = NULL; attr.ObjectName = NULL; + if (GetVersion() & 0x80000000) access = PROCESS_ALL_ACCESS; + status = NtOpenProcess(&handle, access, &attr, &cid); if (status != STATUS_SUCCESS) {

1 0