April 2009 - Wine-commits - list.winehq.org

Christian Costa : amstream/tests: Fix crosstest build.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: d755cd7c4a727b5eeaf750e62889a78f0cc47cef URL: http://source.winehq.org/git/wine.git/?a=commit;h=d755cd7c4a727b5eeaf750e62… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Apr 15 00:16:03 2009 +0200 amstream/tests: Fix crosstest build. --- dlls/amstream/tests/Makefile.in | 2 +- dlls/amstream/tests/amstream.c | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/amstream/tests/Makefile.in b/dlls/amstream/tests/Makefile.in index 07e98b4..cc44995 100644 --- a/dlls/amstream/tests/Makefile.in +++ b/dlls/amstream/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = amstream.dll -IMPORTS = kernel32 oleaut32 ole32 quartz strmiids +IMPORTS = quartz oleaut32 ole32 kernel32 CTESTS = \ amstream.c diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 15b8a7b..c376e8e 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -23,6 +23,7 @@ #define COBJMACROS #include "wine/test.h" +#include "initguid.h" #include "amstream.h" #define FILE_LEN 9

1 0

Michael Stefaniuc : mshtml/tests: Replace long with LONG.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: cb538198d2087267910893f595620e363817fc3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb538198d2087267910893f59… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 15 09:45:09 2009 +0200 mshtml/tests: Replace long with LONG. --- dlls/mshtml/tests/dom.c | 66 +++++++++++++++++++++++----------------------- 1 files changed, 33 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb538198d208726791089…

1 0

Dmitry Timoshkov : winedbg: Fix a typo in the comment.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: c23beb3102ed9d9e23e13f4b1b320b0d84f4defc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c23beb3102ed9d9e23e13f4b1… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Apr 15 17:48:08 2009 +0900 winedbg: Fix a typo in the comment. --- programs/winedbg/be_x86_64.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index b1315bb..e822012 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -88,7 +88,7 @@ static void be_x86_64_print_context(HANDLE hThread, const CONTEXT* ctx, if (ctx->EFlags & 0x00004000) *pt-- = 'N'; /* Nested Task Flag */ if (ctx->EFlags & 0x00008000) *pt-- = '-'; if (ctx->EFlags & 0x00010000) *pt-- = 'R'; /* Resume Flag */ - if (ctx->EFlags & 0x00020000) *pt-- = 'V'; /* Vritual Mode Flag */ + if (ctx->EFlags & 0x00020000) *pt-- = 'V'; /* Virtual Mode Flag */ if (ctx->EFlags & 0x00040000) *pt-- = 'a'; /* Alignment Check Flag */ dbg_printf(" rip:%016lx rsp:%016lx rbp:%016lx eflags:%08x (%s)\n",

1 0

Hans Leidekker : advapi32: Fix buffer size query for CreateWellKnownSid.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: dbe5453f7c3e9d7abdf647fe86587d132a212c3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbe5453f7c3e9d7abdf647fe8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 15 14:59:10 2009 +0200 advapi32: Fix buffer size query for CreateWellKnownSid. --- dlls/advapi32/security.c | 23 ++++++++++++++++++----- dlls/advapi32/tests/security.c | 23 ++++++++++++++++++++++- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index f8715e0..65e68ff 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -859,7 +859,8 @@ CreateWellKnownSid( WELL_KNOWN_SID_TYPE WellKnownSidType, unsigned int i; TRACE("(%d, %s, %p, %p)\n", WellKnownSidType, debugstr_sid(DomainSid), pSid, cbSid); - if (cbSid == NULL || pSid == NULL || (DomainSid && !IsValidSid(DomainSid))) { + if (cbSid == NULL || (DomainSid && !IsValidSid(DomainSid))) + { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -868,11 +869,17 @@ CreateWellKnownSid( WELL_KNOWN_SID_TYPE WellKnownSidType, if (WellKnownSids[i].Type == WellKnownSidType) { DWORD length = GetSidLengthRequired(WellKnownSids[i].Sid.SubAuthorityCount); - if (*cbSid < length) { + if (*cbSid < length) + { + *cbSid = length; SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; } - + if (!pSid) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } CopyMemory(pSid, &WellKnownSids[i].Sid.Revision, length); *cbSid = length; return TRUE; @@ -891,11 +898,17 @@ CreateWellKnownSid( WELL_KNOWN_SID_TYPE WellKnownSidType, DWORD domain_sid_length = GetSidLengthRequired(domain_subauth); DWORD output_sid_length = GetSidLengthRequired(domain_subauth + 1); - if (*cbSid < output_sid_length) { + if (*cbSid < output_sid_length) + { + *cbSid = output_sid_length; SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; } - + if (!pSid) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } CopyMemory(pSid, DomainSid, domain_sid_length); (*GetSidSubAuthorityCount(pSid))++; (*GetSidSubAuthority(pSid, domain_subauth)) = WellKnownRids[i].Rid; diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index ac848bb..f775d10 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1354,7 +1354,9 @@ struct well_known_sid_value static void test_CreateWellKnownSid(void) { SID_IDENTIFIER_AUTHORITY ident = { SECURITY_NT_AUTHORITY }; - PSID domainsid; + PSID domainsid, sid; + DWORD size, error; + BOOL ret; int i; if (!pCreateWellKnownSid) @@ -1363,6 +1365,25 @@ static void test_CreateWellKnownSid(void) return; } + size = 0; + SetLastError(0xdeadbeef); + ret = pCreateWellKnownSid(WinInteractiveSid, NULL, NULL, &size); + error = GetLastError(); + ok(!ret, "CreateWellKnownSid succeeded\n"); + ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", error); + ok(size, "expected size > 0\n"); + + SetLastError(0xdeadbeef); + ret = pCreateWellKnownSid(WinInteractiveSid, NULL, NULL, &size); + error = GetLastError(); + ok(!ret, "CreateWellKnownSid succeeded\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + + sid = HeapAlloc(GetProcessHeap(), 0, size); + ret = pCreateWellKnownSid(WinInteractiveSid, NULL, sid, &size); + ok(ret, "CreateWellKnownSid failed %u\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, sid); + /* a domain sid usually have three subauthorities but we test that CreateWellKnownSid doesn't check it */ AllocateAndInitializeSid(&ident, 6, SECURITY_NT_NON_UNIQUE, 12, 23, 34, 45, 56, 0, 0, &domainsid);

1 0

Hans Leidekker : msvcrt: Implement ___lc_codepage_func, ___lc_collate_cp_func and ___lc_handle_func.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: 4aec827b1ed0fdddefb17e47fb4433d00334998a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aec827b1ed0fdddefb17e47f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 15 15:18:19 2009 +0200 msvcrt: Implement ___lc_codepage_func, ___lc_collate_cp_func and ___lc_handle_func. --- dlls/msvcrt/locale.c | 24 ++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 6 +++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index f524c8d..5d6e545 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -607,3 +607,27 @@ void CDECL __lconv_init(void) { FIXME(" stub\n"); } + +/********************************************************************* + * ___lc_handle_func (MSVCRT.@) + */ +HANDLE * CDECL ___lc_handle_func(void) +{ + return MSVCRT___lc_handle; +} + +/********************************************************************* + * ___lc_codepage_func (MSVCRT.@) + */ +int CDECL ___lc_codepage_func(void) +{ + return MSVCRT___lc_codepage; +} + +/********************************************************************* + * ___lc_collate_cp_func (MSVCRT.@) + */ +int CDECL ___lc_collate_cp_func(void) +{ + return MSVCRT___lc_collate_cp; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 145b2b0..e67251d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -84,9 +84,9 @@ @ cdecl __RTDynamicCast(ptr long ptr ptr long) MSVCRT___RTDynamicCast @ cdecl __RTtypeid(ptr) MSVCRT___RTtypeid @ cdecl __STRINGTOLD(ptr ptr str long) -@ stub ___lc_codepage_func -@ stub ___lc_collate_cp_func -@ stub ___lc_handle_func +@ cdecl ___lc_codepage_func() +@ cdecl ___lc_collate_cp_func() +@ cdecl ___lc_handle_func() @ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func @ cdecl ___setlc_active_func() MSVCRT____setlc_active_func @ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func

1 0

Aric Stewart : msctf: Correct index for being unable to pop last context. We need to leave one behind.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: ed74088d7ddf0c389e7596237add7cb751b17a0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed74088d7ddf0c389e7596237… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Apr 10 13:16:14 2009 -0500 msctf: Correct index for being unable to pop last context. We need to leave one behind. --- dlls/msctf/documentmgr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index 4ffd0b6..e1e5b19 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -167,7 +167,7 @@ static HRESULT WINAPI DocumentMgr_Pop(ITfDocumentMgr *iface, DWORD dwFlags) if (dwFlags) return E_INVALIDARG; - if (This->contextStack[0] == NULL) /* Cannot pop last context */ + if (This->contextStack[1] == NULL) /* Cannot pop last context */ return E_FAIL; ITfThreadMgrEventSink_OnPopContext(This->ThreadMgrSink,This->contextStack[0]);

1 0

Hans Leidekker : winex11.drv: Set HKCU\Keyboard Layout\Preload key.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: 67a11c60afe77aa8dff6380b75e947fcf606589c URL: http://source.winehq.org/git/wine.git/?a=commit;h=67a11c60afe77aa8dff6380b7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 14 12:35:28 2009 +0200 winex11.drv: Set HKCU\Keyboard Layout\Preload key. --- dlls/winex11.drv/keyboard.c | 66 +++++++++++++++++++++++++++++------------- 1 files changed, 45 insertions(+), 21 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index f7dad12..80f8445 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -44,6 +44,7 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "winreg.h" #include "winnls.h" #include "x11drv.h" #include "wine/server.h" @@ -1613,6 +1614,48 @@ static HKL get_locale_kbd_layout(void) return (HKL)layout; } +/*********************************************************************** + * GetKeyboardLayoutName (X11DRV.@) + */ +BOOL CDECL X11DRV_GetKeyboardLayoutName(LPWSTR name) +{ + static const WCHAR formatW[] = {'%','0','8','l','x',0}; + DWORD layout; + LANGID langid; + + layout = main_key_tab[kbd_layout].lcid; + /* see comment for get_locale_kbd_layout */ + langid = PRIMARYLANGID(LANGIDFROMLCID(layout)); + if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) + layout |= 0xe001 << 16; /* FIXME */ + + sprintfW(name, formatW, layout); + TRACE("returning %s\n", debugstr_w(name)); + return TRUE; +} + +static void set_kbd_layout_preload_key(void) +{ + static const WCHAR preload[] = + {'K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','\\','P','r','e','l','o','a','d',0}; + static const WCHAR one[] = {'1',0}; + + HKEY hkey; + WCHAR layout[KL_NAMELENGTH]; + + if (RegCreateKeyExW(HKEY_CURRENT_USER, preload, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL)) + return; + + if (!RegQueryValueExW(hkey, one, NULL, NULL, NULL, NULL)) + { + RegCloseKey(hkey); + return; + } + if (X11DRV_GetKeyboardLayoutName(layout)) + RegSetValueExW(hkey, one, 0, REG_SZ, (const BYTE *)layout, sizeof(layout)); + + RegCloseKey(hkey); +} /********************************************************************** * X11DRV_InitKeyboard @@ -1630,6 +1673,8 @@ void X11DRV_InitKeyboard( Display *display ) const char (*lkey)[MAIN_LEN][4]; char vkey_used[256] = { 0 }; + set_kbd_layout_preload_key(); + wine_tsx11_lock(); XDisplayKeycodes(display, &min_keycode, &max_keycode); ksp = XGetKeyboardMapping(display, min_keycode, @@ -1901,27 +1946,6 @@ HKL CDECL X11DRV_GetKeyboardLayout(DWORD dwThreadid) /*********************************************************************** - * GetKeyboardLayoutName (X11DRV.@) - */ -BOOL CDECL X11DRV_GetKeyboardLayoutName(LPWSTR name) -{ - static const WCHAR formatW[] = {'%','0','8','l','x',0}; - DWORD layout; - LANGID langid; - - layout = main_key_tab[kbd_layout].lcid; - /* see comment for get_locale_kbd_layout */ - langid = PRIMARYLANGID(LANGIDFROMLCID(layout)); - if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) - layout |= 0xe001 << 16; /* FIXME */ - - sprintfW(name, formatW, layout); - TRACE("returning %s\n", debugstr_w(name)); - return TRUE; -} - - -/*********************************************************************** * LoadKeyboardLayout (X11DRV.@) */ HKL CDECL X11DRV_LoadKeyboardLayout(LPCWSTR name, UINT flags)

1 0

Aric Stewart : msctf: Correct order of arguments to OnSetFocus sink call.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: 01a00b53fb7262b3a2f75a30c740b9426966f9f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01a00b53fb7262b3a2f75a30c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Apr 10 11:26:45 2009 -0500 msctf: Correct order of arguments to OnSetFocus sink call. --- dlls/msctf/threadmgr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 5461425..3912b29 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -246,7 +246,7 @@ static HRESULT WINAPI ThreadMgr_SetFocus( ITfThreadMgr* iface, ITfDocumentMgr *p if (!pdimFocus || FAILED(IUnknown_QueryInterface(pdimFocus,&IID_ITfDocumentMgr,(LPVOID*) &check))) return E_INVALIDARG; - ITfThreadMgrEventSink_OnSetFocus((ITfThreadMgrEventSink*)&This->ThreadMgrEventSinkVtbl, This->focus, check); + ITfThreadMgrEventSink_OnSetFocus((ITfThreadMgrEventSink*)&This->ThreadMgrEventSinkVtbl, check, This->focus); if (This->focus) ITfDocumentMgr_Release(This->focus);

1 0

Aric Stewart : msctf: Release focused DocumentMgr on Deactivate and make sure to do a OnSetFocus Sink .
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: af860c1a85e4e6105ea992c338bdae753427d2d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af860c1a85e4e6105ea992c33… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Apr 10 11:26:51 2009 -0500 msctf: Release focused DocumentMgr on Deactivate and make sure to do a OnSetFocus Sink. --- dlls/msctf/threadmgr.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 3912b29..a73beee 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -196,6 +196,14 @@ static HRESULT WINAPI ThreadMgr_fnDeactivate( ITfThreadMgr* iface) { ThreadMgr *This = (ThreadMgr *)iface; FIXME("STUB:(%p)\n",This); + + if (This->focus) + { + ITfThreadMgrEventSink_OnSetFocus((ITfThreadMgrEventSink*)&This->ThreadMgrEventSinkVtbl, 0, This->focus); + ITfDocumentMgr_Release(This->focus); + This->focus = 0; + } + return E_NOTIMPL; }

1 0

Aric Stewart : msctf: ITfDocumentMgr:: GetBase returns the top if there is only one context pushed.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: 846093ea26a5be6724320fbb26954800e51729b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=846093ea26a5be6724320fbb2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Apr 10 13:16:11 2009 -0500 msctf: ITfDocumentMgr::GetBase returns the top if there is only one context pushed. --- dlls/msctf/documentmgr.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index ab250cb..4ffd0b6 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -199,14 +199,21 @@ static HRESULT WINAPI DocumentMgr_GetTop(ITfDocumentMgr *iface, ITfContext **ppi static HRESULT WINAPI DocumentMgr_GetBase(ITfDocumentMgr *iface, ITfContext **ppic) { DocumentMgr *This = (DocumentMgr *)iface; + ITfContext *tgt; + TRACE("(%p)\n",This); if (!ppic) return E_INVALIDARG; if (This->contextStack[1]) - ITfContext_AddRef(This->contextStack[1]); + tgt = This->contextStack[1]; + else + tgt = This->contextStack[0]; + + if (tgt) + ITfContext_AddRef(tgt); - *ppic = This->contextStack[1]; + *ppic = tgt; return S_OK; }

1 0