April 2008 - wine-commits

Alexander Dorofeyev : wined3d: Add ENTER_GL/ LEAVE_GL in IWineD3DEventQueryImpl_Issue.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 93fefdf94d2fdb8b2bf1bc70ee1853307eebe156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93fefdf94d2fdb8b2bf1bc70e… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon Apr 7 00:06:17 2008 +0300 wined3d: Add ENTER_GL/LEAVE_GL in IWineD3DEventQueryImpl_Issue. --- dlls/wined3d/query.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 2b95d38..96651bc 100644 -… [View More]

1 0

Alexander Dorofeyev : wined3d: Add ENTER_GL/ LEAVE_GL in IWineD3DEventQueryImpl_GetData.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 84553fd8645d4a4a6065e7ea1b9e2094f834a788 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84553fd8645d4a4a6065e7ea1… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon Apr 7 00:06:15 2008 +0300 wined3d: Add ENTER_GL/LEAVE_GL in IWineD3DEventQueryImpl_GetData. --- dlls/wined3d/query.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 85832e4..2b95d38 … [View More]

1 0

Alexander Dorofeyev : wined3d: Add ENTER_GL/ LEAVE_GL in IWineD3DOcclusionQueryImpl_GetData.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 2711b8460173e359a0fb9db31d85648bfa4e5365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2711b8460173e359a0fb9db31… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon Apr 7 00:06:12 2008 +0300 wined3d: Add ENTER_GL/LEAVE_GL in IWineD3DOcclusionQueryImpl_GetData. --- dlls/wined3d/query.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index f3b9cc6..85832e4 … [View More]

1 0

Alexander Dorofeyev : wined3d: Add ENTER_GL/ LEAVE_GL in IWineD3DQueryImpl_Release.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: f24289e49a07b934863fca588fd09225b05cb4dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f24289e49a07b934863fca588… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon Apr 7 00:06:07 2008 +0300 wined3d: Add ENTER_GL/LEAVE_GL in IWineD3DQueryImpl_Release. --- dlls/wined3d/query.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 4c343bf..f3b9cc6 100644 --- a/… [View More]

1 0

Alexander Dorofeyev : wined3d: LEAVE_GL when exiting with error in tesselate_rectpatch.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 5ccf91b70552270480bfb07a11bb3979e37478c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ccf91b70552270480bfb07a1… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon Apr 7 00:06:04 2008 +0300 wined3d: LEAVE_GL when exiting with error in tesselate_rectpatch. --- dlls/wined3d/drawprim.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index fc09b75..… [View More]

1 0

Alexander Dorofeyev : wined3d: Add ENTER_GL/ LEAVE_GL in IWineD3DDeviceImpl_ResourceReleased.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 2157c7d76c1f09084893d4ebee517975f5ed0390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2157c7d76c1f09084893d4ebe… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon Apr 7 00:06:01 2008 +0300 wined3d: Add ENTER_GL/LEAVE_GL in IWineD3DDeviceImpl_ResourceReleased. --- dlls/wined3d/device.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index eed3541..b022c4e … [View More]

1 0

Alexander Dorofeyev : wined3d: Add ENTER_GL/ LEAVE_GL in IWineD3DDeviceImpl_ColorFill.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: a2017f4f212077298ca394260b796104c5185198 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2017f4f212077298ca394260… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon Apr 7 00:05:58 2008 +0300 wined3d: Add ENTER_GL/LEAVE_GL in IWineD3DDeviceImpl_ColorFill. --- dlls/wined3d/device.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 538a79d..eed3541 100644 … [View More]

1 0

Alexander Dorofeyev : wined3d: Add ENTER_GL/ LEAVE_GL in IWineD3DDeviceImpl_Uninit3D.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 7c261553d059e2464d02e2626d2be77136ba2529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c261553d059e2464d02e2626… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon Apr 7 00:05:55 2008 +0300 wined3d: Add ENTER_GL/LEAVE_GL in IWineD3DDeviceImpl_Uninit3D. --- dlls/wined3d/device.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 25bd800..538a79d 100644 -… [View More]

1 0

Alexander Dorofeyev : wined3d: Implement CONVERT_RGB32_888 conversion.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 29b38bc886c81aef906594c1c75974eb4aad155b URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b38bc886c81aef906594c1c… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon Apr 7 00:05:48 2008 +0300 wined3d: Implement CONVERT_RGB32_888 conversion. --- dlls/wined3d/surface.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ddd0f32..… [View More]

1 0

Alexander Dorofeyev : wined3d: Don't copy the extra line.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 2f9e8a901cebf0c6c3c74e61c385322bfa7e212d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f9e8a901cebf0c6c3c74e61c… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon Apr 7 00:05:42 2008 +0300 wined3d: Don't copy the extra line. biSizeImage has an extra line added to it, and passing it to memcpy can cause a crash. --- dlls/wined3d/surface_base.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/… [View More]

1 0

Aric Stewart : imm32: Properly handle unicode and non unicode IMEs with SetCompositionString.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: e7c00ca727fe08f5d98171af18df248c6c307340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7c00ca727fe08f5d98171af1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Apr 7 10:45:22 2008 -0500 imm32: Properly handle unicode and non unicode IMEs with SetCompositionString. --- dlls/imm32/imm.c | 51 ++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 44 insertions(+), 7 deletions(-) diff --git a/dlls/imm32/imm.c … [View More]b/dlls/imm32/imm.c index beda98f..0995fb6 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1472,10 +1472,18 @@ BOOL WINAPI ImmSetCompositionStringA( WCHAR *CompBuffer = NULL; WCHAR *ReadBuffer = NULL; BOOL rc; + InputContextData *data = (InputContextData*)hIMC; TRACE("(%p, %d, %p, %d, %p, %d):\n", hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen); + if (!data) + return FALSE; + + if (!is_himc_ime_unicode(data)) + return data->immKbd->pImeSetCompositionString(hIMC, dwIndex, lpComp, + dwCompLen, lpRead, dwReadLen); + comp_len = MultiByteToWideChar(CP_ACP, 0, lpComp, dwCompLen, NULL, 0); if (comp_len) { @@ -1507,19 +1515,48 @@ BOOL WINAPI ImmSetCompositionStringW( LPCVOID lpComp, DWORD dwCompLen, LPCVOID lpRead, DWORD dwReadLen) { - InputContextData *data = (InputContextData*)hIMC; + DWORD comp_len; + DWORD read_len; + CHAR *CompBuffer = NULL; + CHAR *ReadBuffer = NULL; + BOOL rc; + InputContextData *data = (InputContextData*)hIMC; - TRACE("(%p, %d, %p, %d, %p, %d):\n", - hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen); + TRACE("(%p, %d, %p, %d, %p, %d):\n", + hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen); - if (!data) + if (!data) return FALSE; - if (is_himc_ime_unicode(data)) + if (is_himc_ime_unicode(data)) return data->immKbd->pImeSetCompositionString(hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen); - else - return FALSE; + + comp_len = WideCharToMultiByte(CP_ACP, 0, lpComp, dwCompLen, NULL, 0, NULL, + NULL); + if (comp_len) + { + CompBuffer = HeapAlloc(GetProcessHeap(),0,comp_len); + WideCharToMultiByte(CP_ACP, 0, lpComp, dwCompLen, CompBuffer, comp_len, + NULL, NULL); + } + + read_len = WideCharToMultiByte(CP_ACP, 0, lpRead, dwReadLen, NULL, 0, NULL, + NULL); + if (read_len) + { + ReadBuffer = HeapAlloc(GetProcessHeap(),0,read_len); + WideCharToMultiByte(CP_ACP, 0, lpRead, dwReadLen, ReadBuffer, read_len, + NULL, NULL); + } + + rc = ImmSetCompositionStringA(hIMC, dwIndex, CompBuffer, comp_len, + ReadBuffer, read_len); + + HeapFree(GetProcessHeap(), 0, CompBuffer); + HeapFree(GetProcessHeap(), 0, ReadBuffer); + + return rc; } /*********************************************************************** [View Less]

1 0

Aric Stewart : imm: Default context and hwnd are per thread so store that data in a thread local storage .
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: b72dcd114d1c622b3046506563cc91fc38d40835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b72dcd114d1c622b304650656… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Apr 7 10:17:32 2008 -0500 imm: Default context and hwnd are per thread so store that data in a thread local storage. --- dlls/imm32/imm.c | 79 +++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 57 insertions(+), 22 deletions(-) diff --git a/… [View More]dlls/imm32/imm.c b/dlls/imm32/imm.c index 4d82398..beda98f 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -86,10 +86,13 @@ typedef struct _tagTRANSMSG { LPARAM lParam; } TRANSMSG, *LPTRANSMSG; -static InputContextData *root_context = NULL; -static HWND hwndDefault = NULL; -static HANDLE hImeInst; +typedef struct _tagIMMThreadData { + HIMC defaultContext; + HWND hwndDefault; +} IMMThreadData; +static HANDLE hImeInst; +static DWORD tlsIndex = 0; static struct list ImmHklList = LIST_INIT(ImmHklList); /* MSIME messages */ @@ -130,6 +133,29 @@ static inline CHAR *strdupWtoA( const WCHAR *str ) return ret; } +static IMMThreadData* IMM_GetThreadData(void) +{ + return (IMMThreadData*)TlsGetValue(tlsIndex); +} + +static void IMM_InitThreadData(void) +{ + IMMThreadData* data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(IMMThreadData)); + TlsSetValue(tlsIndex,data); + + TRACE("Thread Data Created\n"); +} + +static void IMM_FreeThreadData(void) +{ + IMMThreadData* data = TlsGetValue(tlsIndex); + ImmDestroyContext(data->defaultContext); + DestroyWindow(data->hwndDefault); + HeapFree(GetProcessHeap(),0,data); + TRACE("Thread Data Destroyed\n"); +} + static HMODULE LoadDefaultWineIME(void) { char buffer[MAX_PATH], libname[32], *name, *next; @@ -265,12 +291,21 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) switch (fdwReason) { case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); hImeInst = hInstDLL; IMM_RegisterMessages(); + tlsIndex = TlsAlloc(); + IMM_InitThreadData(); + break; + case DLL_THREAD_ATTACH: + IMM_InitThreadData(); + break; + case DLL_THREAD_DETACH: + IMM_FreeThreadData(); break; case DLL_PROCESS_DETACH: + IMM_FreeThreadData(); IMM_FreeAllImmHkl(); + TlsFree(tlsIndex); break; } return TRUE; @@ -321,8 +356,8 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) TRACE("(%p, %p):\n", hWnd, hIMC); - if (!root_context) - root_context = ImmCreateContext(); + if (!IMM_GetThreadData()->defaultContext) + IMM_GetThreadData()->defaultContext = ImmCreateContext(); /* * If already associated just return @@ -335,11 +370,11 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) old = (HIMC)RemovePropW(hWnd,szwWineIMCProperty); if (old == NULL) - old = (HIMC)root_context; + old = IMM_GetThreadData()->defaultContext; else if (old == (HIMC)-1) old = NULL; - if (hIMC != (HIMC)root_context) + if (hIMC != IMM_GetThreadData()->defaultContext) { if (hIMC == NULL) /* Meaning disable imm for that window*/ SetPropW(hWnd,szwWineIMCProperty,(HANDLE)-1); @@ -499,8 +534,8 @@ BOOL WINAPI ImmDestroyContext(HIMC hIMC) data->immKbd->uSelected --; data->immKbd->pImeSelect(hIMC, FALSE); - if (hwndDefault == data->imeWnd) - hwndDefault = NULL; + if (IMM_GetThreadData()->hwndDefault == data->imeWnd) + IMM_GetThreadData()->hwndDefault = NULL; DestroyWindow(data->imeWnd); ImmDestroyIMCC(data->IMC.hCompStr); @@ -913,14 +948,14 @@ HIMC WINAPI ImmGetContext(HWND hWnd) HIMC rc = NULL; TRACE("%p\n", hWnd); - if (!root_context) - root_context = ImmCreateContext(); + if (!IMM_GetThreadData()->defaultContext) + IMM_GetThreadData()->defaultContext = ImmCreateContext(); rc = (HIMC)GetPropW(hWnd,szwWineIMCProperty); if (rc == (HIMC)-1) rc = NULL; else if (rc == NULL) - rc = (HIMC)root_context; + rc = IMM_GetThreadData()->defaultContext; if (rc) { @@ -981,8 +1016,8 @@ BOOL WINAPI ImmGetConversionStatus( */ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) { - TRACE("Default is %x\n",(unsigned)hwndDefault); - return hwndDefault; + TRACE("Default is %x\n",(unsigned)IMM_GetThreadData()->hwndDefault); + return IMM_GetThreadData()->hwndDefault; } /*********************************************************************** @@ -1288,11 +1323,11 @@ BOOL WINAPI ImmIsUIMessageA( (msg == WM_MSIME_DOCUMENTFEED)) { - if (!hwndDefault) + if (!IMM_GetThreadData()->hwndDefault) ImmGetDefaultIMEWnd(NULL); if (hWndIME == NULL) - PostMessageA(hwndDefault, msg, wParam, lParam); + PostMessageA(IMM_GetThreadData()->hwndDefault, msg, wParam, lParam); rc = TRUE; } @@ -1306,7 +1341,7 @@ BOOL WINAPI ImmIsUIMessageW( HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam) { BOOL rc = FALSE; - TRACE("(%p, %d, %ld, %ld): stub\n", hWndIME, msg, wParam, lParam); + TRACE("(%p, %d, %ld, %ld):\n", hWndIME, msg, wParam, lParam); if ((msg >= WM_IME_STARTCOMPOSITION && msg <= WM_IME_KEYLAST) || (msg >= WM_IME_SETCONTEXT && msg <= WM_IME_KEYUP) || (msg == WM_MSIME_SERVICE) || @@ -1506,16 +1541,16 @@ BOOL WINAPI ImmSetCompositionWindow( data->IMC.cfCompForm = *lpCompForm; - if (IsWindowVisible(hwndDefault)) + if (IsWindowVisible(IMM_GetThreadData()->hwndDefault)) { reshow = TRUE; - ShowWindow(hwndDefault,SW_HIDE); + ShowWindow(IMM_GetThreadData()->hwndDefault,SW_HIDE); } /* FIXME: this is a partial stub */ if (reshow) - ShowWindow(hwndDefault,SW_SHOWNOACTIVATE); + ShowWindow(IMM_GetThreadData()->hwndDefault,SW_SHOWNOACTIVATE); ImmInternalSendIMENotify(data, IMN_SETCOMPOSITIONWINDOW, 0); return TRUE; @@ -1558,7 +1593,7 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) data->immKbd->imeClassName, NULL, WS_POPUP, 0, 0, 1, 1, 0, 0, hImeInst, 0); SetWindowLongW(data->imeWnd, IMMGWL_IMC, (LONG)data); - hwndDefault = data->imeWnd; + IMM_GetThreadData()->hwndDefault = data->imeWnd; } data->IMC.fOpen = fOpen; [View Less]

1 0

Aric Stewart : imm32: Make use of of the loaded IME for all processing.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 7fd05b01aeb7f0437c089c2b2fc6a47b0d8e02d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fd05b01aeb7f0437c089c2b2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Apr 7 09:38:24 2008 -0500 imm32: Make use of of the loaded IME for all processing. --- dlls/imm32/imm.c | 988 ++++-------------------------------------------------- 1 files changed, 61 insertions(+), 927 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7fd05b01aeb7f0437c089…

1 0

Aric Stewart : winex11: Have all xim interaction pass through the new x11drv IME interface.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 26b8aa43a0a996b28805175bdb2ad47b14b8dae7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26b8aa43a0a996b28805175bd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Apr 7 08:35:42 2008 -0500 winex11: Have all xim interaction pass through the new x11drv IME interface. --- dlls/winex11.drv/xim.c | 104 ++++++------------------------------------------ 1 files changed, 12 insertions(+), 92 deletions(-) diff --git a/dlls/winex11.… [View More]drv/xim.c b/dlls/winex11.drv/xim.c index 44aefa8..4505ecd 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -35,23 +35,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); -/* this must match with imm32/imm.c */ -#define FROM_IME 0xcafe1337 - BOOL ximInComposeMode=FALSE; -typedef struct tagInputContextData -{ - BOOL bInternalState; - BOOL bRead; - BOOL bInComposition; - HFONT textfont; - - DWORD dwLock; - INPUTCONTEXT IMC; -} InputContextData; - -static HIMC root_context; static XIMStyle ximStyle = 0; static XIMStyle ximStyleRoot = 0; @@ -63,17 +48,6 @@ static LPBYTE ResultString = NULL; static DWORD dwResultStringSize = 0; static DWORD dwPreeditPos = 0; -static HMODULE hImmDll = NULL; -static HIMC (WINAPI *pImmAssociateContext)(HWND,HIMC); -static HIMC (WINAPI *pImmCreateContext)(void); -static VOID (WINAPI *pImmSetOpenStatus)(HIMC,BOOL); -static BOOL (WINAPI *pImmSetCompositionString)(HIMC, DWORD, LPWSTR, - DWORD, LPWSTR, DWORD); -static LONG (WINAPI *pImmGetCompositionString)(HIMC, DWORD, LPVOID, DWORD); -static VOID (WINAPI *pImmNotifyIME)(HIMC, DWORD, DWORD, DWORD); - -/* WINE specific messages from the xim in x11drv level */ - #define STYLE_OFFTHESPOT (XIMPreeditArea | XIMStatusArea) #define STYLE_OVERTHESPOT (XIMPreeditPosition | XIMStatusNothing) #define STYLE_ROOT (XIMPreeditNothing | XIMStatusNothing) @@ -82,41 +56,6 @@ static VOID (WINAPI *pImmNotifyIME)(HIMC, DWORD, DWORD, DWORD); /* inorder to enable deadkey support */ #define STYLE_NONE (XIMPreeditNothing | XIMStatusNothing) -/* - * here are the functions that sort of marshall calls into IMM32.DLL - */ -static void LoadImmDll(void) -{ - hImmDll = LoadLibraryA("imm32.dll"); - - pImmAssociateContext = (void *)GetProcAddress(hImmDll, "ImmAssociateContext"); - if (!pImmAssociateContext) - WARN("IMM: pImmAssociateContext not found in DLL\n"); - - pImmCreateContext = (void *)GetProcAddress(hImmDll, "ImmCreateContext"); - if (!pImmCreateContext) - WARN("IMM: pImmCreateContext not found in DLL\n"); - - pImmSetOpenStatus = (void *)GetProcAddress( hImmDll, "ImmSetOpenStatus"); - if (!pImmSetOpenStatus) - WARN("IMM: pImmSetOpenStatus not found in DLL\n"); - - pImmSetCompositionString =(void *)GetProcAddress(hImmDll, "ImmSetCompositionStringW"); - - if (!pImmSetCompositionString) - WARN("IMM: pImmSetCompositionStringW not found in DLL\n"); - - pImmGetCompositionString =(void *)GetProcAddress(hImmDll, "ImmGetCompositionStringW"); - - if (!pImmGetCompositionString) - WARN("IMM: pImmGetCompositionStringW not found in DLL\n"); - - pImmNotifyIME = (void *)GetProcAddress( hImmDll, "ImmNotifyIME"); - - if (!pImmNotifyIME) - WARN("IMM: pImmNotifyIME not found in DLL\n"); -} - static BOOL X11DRV_ImmSetInternalString(DWORD dwIndex, DWORD dwOffset, DWORD selLength, LPWSTR lpComp, DWORD dwCompLen) { @@ -211,10 +150,8 @@ static BOOL X11DRV_ImmSetInternalString(DWORD dwIndex, DWORD dwOffset, } } - if (pImmSetCompositionString) - rc = pImmSetCompositionString((HIMC)FROM_IME, SCS_SETSTR, - (LPWSTR)CompositionString, dwCompStringLength, - NULL, 0); + rc = IME_SetCompositionString(SCS_SETSTR, (LPWSTR)CompositionString, + dwCompStringLength, NULL, 0); } else if ((dwIndex == GCS_RESULTSTR) && (lpComp) && (dwCompLen)) { @@ -224,13 +161,10 @@ static BOOL X11DRV_ImmSetInternalString(DWORD dwIndex, DWORD dwOffset, ResultString= HeapAlloc(GetProcessHeap(),0,byte_length); memcpy(ResultString,lpComp,byte_length); - if (pImmSetCompositionString) - rc = pImmSetCompositionString((HIMC)FROM_IME, SCS_SETSTR, - (LPWSTR)ResultString, dwResultStringSize, - NULL, 0); + rc = IME_SetCompositionString(SCS_SETSTR, (LPWSTR)ResultString, + dwResultStringSize, NULL, 0); - if (pImmNotifyIME) - pImmNotifyIME((HIMC)FROM_IME, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); + IME_NotifyIME( NI_COMPOSITIONSTR, CPS_COMPLETE, 0); } return rc; @@ -244,8 +178,8 @@ void X11DRV_XIMLookupChars( const char *str, DWORD count ) dwOutput = MultiByteToWideChar(CP_UNIXCP, 0, str, count, wcOutput, sizeof(wcOutput)/sizeof(WCHAR)); - if (pImmAssociateContext && (focus = GetFocus())) - pImmAssociateContext(focus,root_context); + if ((focus = GetFocus())) + IME_UpdateAssociation(focus); X11DRV_ImmSetInternalString(GCS_RESULTSTR,0,0,wcOutput,dwOutput); } @@ -268,8 +202,7 @@ static void X11DRV_ImmSetOpenStatus(BOOL fOpen) ResultString = NULL; } - if (pImmSetOpenStatus) - pImmSetOpenStatus((HIMC)FROM_IME,fOpen); + IME_SetOpenStatus(fOpen); } static int XIMPreEditStartCallback(XIC ic, XPointer client_data, XPointer call_data) @@ -277,8 +210,7 @@ static int XIMPreEditStartCallback(XIC ic, XPointer client_data, XPointer call_d TRACE("PreEditStartCallback %p\n",ic); X11DRV_ImmSetOpenStatus(TRUE); ximInComposeMode = TRUE; - SendMessageW(((InputContextData*)root_context)->IMC.hWnd, - EM_GETSEL, 0, (LPARAM)&dwPreeditPos); + IME_SendMessageToSelectedHWND(EM_GETSEL, 0, (LPARAM)&dwPreeditPos); return -1; } @@ -344,7 +276,7 @@ static void XIMPreEditCaretCallback(XIC ic, XPointer client_data, if (P_C) { - int pos = pImmGetCompositionString(root_context, GCS_CURSORPOS, NULL, 0); + int pos = IME_GetCursorPos(); TRACE("pos: %d\n", pos); switch(P_C->direction) { @@ -373,8 +305,8 @@ static void XIMPreEditCaretCallback(XIC ic, XPointer client_data, FIXME("Not implemented\n"); break; } - SendMessageW(((InputContextData*)root_context)->IMC.hWnd, - EM_SETSEL, dwPreeditPos + pos, dwPreeditPos + pos); + IME_SendMessageToSelectedHWND( EM_SETSEL, dwPreeditPos + pos, + dwPreeditPos + pos); P_C->position = pos; } TRACE("Finished\n"); @@ -503,18 +435,6 @@ XIM X11DRV_SetupXIM(Display *display, const char *input_style) IME_XIMPresent(TRUE); IME_UpdateAssociation(NULL); - if(!hImmDll) - { - LoadImmDll(); - - if (pImmCreateContext) - { - root_context = pImmCreateContext(); - if (pImmAssociateContext) - pImmAssociateContext(0,root_context); - } - } - return xim; err: [View Less]

1 0

Aric Stewart : imm32: Implement ImmGetImeMenuItems using loaded IME.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: f4fd36e543bba5293baf3b2981abcb952fdc366c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4fd36e543bba5293baf3b298… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Apr 3 11:21:15 2008 -0500 imm32: Implement ImmGetImeMenuItems using loaded IME. --- dlls/imm32/imm.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 109 insertions(+), 6 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c … [View More]index 4d49530..1b24cb9 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -122,6 +122,7 @@ static void ImmInternalPostIMEMessage(InputContextData*, UINT, WPARAM, LPARAM); static void ImmInternalSetOpenStatus(BOOL fOpen); static HIMCC updateResultStr(HIMCC old, LPWSTR resultstr, DWORD len); +#define is_himc_ime_unicode(p) (p->immKbd->imeInfo.fdwProperty & IME_PROP_UNICODE) #define is_kbd_ime_unicode(p) (p->imeInfo.fdwProperty & IME_PROP_UNICODE) static inline WCHAR *strdupAtoW( const char *str ) @@ -2233,9 +2234,61 @@ DWORD WINAPI ImmGetImeMenuItemsA( HIMC hIMC, DWORD dwFlags, DWORD dwType, LPIMEMENUITEMINFOA lpImeParentMenu, LPIMEMENUITEMINFOA lpImeMenu, DWORD dwSize) { - FIXME("(%p, %i, %i, %p, %p, %i): stub\n", hIMC, dwFlags, dwType, - lpImeParentMenu, lpImeMenu, dwSize); - return 0; + InputContextData *data = (InputContextData*)hIMC; + TRACE("(%p, %i, %i, %p, %p, %i):\n", hIMC, dwFlags, dwType, + lpImeParentMenu, lpImeMenu, dwSize); + if (data->immKbd->hIME && data->immKbd->pImeGetImeMenuItems) + { + if (!is_himc_ime_unicode(data) || (!lpImeParentMenu && !lpImeMenu)) + return data->immKbd->pImeGetImeMenuItems(hIMC, dwFlags, dwType, + (IMEMENUITEMINFOW*)lpImeParentMenu, + (IMEMENUITEMINFOW*)lpImeMenu, dwSize); + else + { + IMEMENUITEMINFOW lpImeParentMenuW; + IMEMENUITEMINFOW *lpImeMenuW, *parent = NULL; + DWORD rc; + + if (lpImeParentMenu) + parent = &lpImeParentMenuW; + if (lpImeMenu) + { + int count = dwSize / sizeof(LPIMEMENUITEMINFOA); + dwSize = count * sizeof(IMEMENUITEMINFOW); + lpImeMenuW = HeapAlloc(GetProcessHeap(), 0, dwSize); + } + else + lpImeMenuW = NULL; + + rc = data->immKbd->pImeGetImeMenuItems(hIMC, dwFlags, dwType, + parent, lpImeMenuW, dwSize); + + if (lpImeParentMenu) + { + memcpy(lpImeParentMenu,&lpImeParentMenuW,sizeof(IMEMENUITEMINFOA)); + lpImeParentMenu->hbmpItem = lpImeParentMenuW.hbmpItem; + WideCharToMultiByte(CP_ACP, 0, lpImeParentMenuW.szString, + -1, lpImeParentMenu->szString, IMEMENUITEM_STRING_SIZE, + NULL, NULL); + } + if (lpImeMenu && rc) + { + int i; + for (i = 0; i < rc; i++) + { + memcpy(&lpImeMenu[i],&lpImeMenuW[1],sizeof(IMEMENUITEMINFOA)); + lpImeMenu[i].hbmpItem = lpImeMenuW[i].hbmpItem; + WideCharToMultiByte(CP_ACP, 0, lpImeMenuW[i].szString, + -1, lpImeMenu[i].szString, IMEMENUITEM_STRING_SIZE, + NULL, NULL); + } + } + HeapFree(GetProcessHeap(),0,lpImeMenuW); + return rc; + } + } + else + return 0; } /*********************************************************************** @@ -2245,9 +2298,59 @@ DWORD WINAPI ImmGetImeMenuItemsW( HIMC hIMC, DWORD dwFlags, DWORD dwType, LPIMEMENUITEMINFOW lpImeParentMenu, LPIMEMENUITEMINFOW lpImeMenu, DWORD dwSize) { - FIXME("(%p, %i, %i, %p, %p, %i): stub\n", hIMC, dwFlags, dwType, - lpImeParentMenu, lpImeMenu, dwSize); - return 0; + InputContextData *data = (InputContextData*)hIMC; + TRACE("(%p, %i, %i, %p, %p, %i):\n", hIMC, dwFlags, dwType, + lpImeParentMenu, lpImeMenu, dwSize); + if (data->immKbd->hIME && data->immKbd->pImeGetImeMenuItems) + { + if (is_himc_ime_unicode(data) || (!lpImeParentMenu && !lpImeMenu)) + return data->immKbd->pImeGetImeMenuItems(hIMC, dwFlags, dwType, + lpImeParentMenu, lpImeMenu, dwSize); + else + { + IMEMENUITEMINFOA lpImeParentMenuA; + IMEMENUITEMINFOA *lpImeMenuA, *parent = NULL; + DWORD rc; + + if (lpImeParentMenu) + parent = &lpImeParentMenuA; + if (lpImeMenu) + { + int count = dwSize / sizeof(LPIMEMENUITEMINFOW); + dwSize = count * sizeof(IMEMENUITEMINFOA); + lpImeMenuA = HeapAlloc(GetProcessHeap(), 0, dwSize); + } + else + lpImeMenuA = NULL; + + rc = data->immKbd->pImeGetImeMenuItems(hIMC, dwFlags, dwType, + (IMEMENUITEMINFOW*)parent, + (IMEMENUITEMINFOW*)lpImeMenuA, dwSize); + + if (lpImeParentMenu) + { + memcpy(lpImeParentMenu,&lpImeParentMenuA,sizeof(IMEMENUITEMINFOA)); + lpImeParentMenu->hbmpItem = lpImeParentMenuA.hbmpItem; + MultiByteToWideChar(CP_ACP, 0, lpImeParentMenuA.szString, + -1, lpImeParentMenu->szString, IMEMENUITEM_STRING_SIZE); + } + if (lpImeMenu && rc) + { + int i; + for (i = 0; i < rc; i++) + { + memcpy(&lpImeMenu[i],&lpImeMenuA[1],sizeof(IMEMENUITEMINFOA)); + lpImeMenu[i].hbmpItem = lpImeMenuA[i].hbmpItem; + MultiByteToWideChar(CP_ACP, 0, lpImeMenuA[i].szString, + -1, lpImeMenu[i].szString, IMEMENUITEM_STRING_SIZE); + } + } + HeapFree(GetProcessHeap(),0,lpImeMenuA); + return rc; + } + } + else + return 0; } /*********************************************************************** [View Less]

1 0

Aric Stewart : imm32: Load a default IME if a specific one is not specified . This defaults to x11.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 2a8a18fc5b35bcc66a842bb62fc03aab31f04c66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a8a18fc5b35bcc66a842bb62… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Apr 3 09:31:47 2008 -0500 imm32: Load a default IME if a specific one is not specified. This defaults to x11. --- dlls/imm32/imm.c | 83 +++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 66 insertions(+), 17 deletions(-) diff --git a/dlls/… [View More]imm32/imm.c b/dlls/imm32/imm.c index ba8dbfc..4d49530 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -20,6 +20,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" @@ -147,6 +148,37 @@ static inline CHAR *strdupWtoA( const WCHAR *str ) return ret; } +static HMODULE LoadDefaultWineIME(void) +{ + char buffer[MAX_PATH], libname[32], *name, *next; + HMODULE module = 0; + HKEY hkey; + + TRACE("Attempting to fall back to wine default IME\n"); + + strcpy( buffer, "x11" ); /* default value */ + /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ + if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Drivers", &hkey )) + { + DWORD type, count = sizeof(buffer); + RegQueryValueExA( hkey, "Ime", 0, &type, (LPBYTE) buffer, &count ); + RegCloseKey( hkey ); + } + + name = buffer; + while (name) + { + next = strchr( name, ',' ); + if (next) *next++ = 0; + + snprintf( libname, sizeof(libname), "wine%s.drv", name ); + if ((module = LoadLibraryA( libname )) != 0) break; + name = next; + } + + return module; +} + /* ImmHkl loading and freeing */ #define LOAD_FUNCPTR(f) if((ptr->p##f = (LPVOID)GetProcAddress(ptr->hIME, #f)) == NULL){WARN("Can't find function %s in ime\n", #f);} static ImmHkl *IMM_GetImmHkl(HKL hkl) @@ -167,32 +199,49 @@ static ImmHkl *IMM_GetImmHkl(HKL hkl) ptr->hkl = hkl; if (ImmGetIMEFileNameW(hkl, filename, MAX_PATH)) ptr->hIME = LoadLibraryW(filename); + if (!ptr->hIME) + ptr->hIME = LoadDefaultWineIME(); if (ptr->hIME) { LOAD_FUNCPTR(ImeInquire); - LOAD_FUNCPTR(ImeDestroy); - LOAD_FUNCPTR(ImeSelect); - if (!ptr->pImeInquire || !ptr->pImeDestroy || !ptr->pImeSelect) + if (!ptr->pImeInquire || !ptr->pImeInquire(&ptr->imeInfo, ptr->imeClassName, NULL)) { FreeLibrary(ptr->hIME); ptr->hIME = NULL; } else { - ptr->pImeInquire(&ptr->imeInfo, ptr->imeClassName, NULL); - LOAD_FUNCPTR(ImeConfigure); - LOAD_FUNCPTR(ImeEscape); - LOAD_FUNCPTR(ImeSetActiveContext); - LOAD_FUNCPTR(ImeToAsciiEx); - LOAD_FUNCPTR(NotifyIME); - LOAD_FUNCPTR(ImeRegisterWord); - LOAD_FUNCPTR(ImeUnregisterWord); - LOAD_FUNCPTR(ImeEnumRegisterWord); - LOAD_FUNCPTR(ImeSetCompositionString); - LOAD_FUNCPTR(ImeConversionList); - LOAD_FUNCPTR(ImeProcessKey); - LOAD_FUNCPTR(ImeGetRegisterWordStyle); - LOAD_FUNCPTR(ImeGetImeMenuItems); + LOAD_FUNCPTR(ImeDestroy); + LOAD_FUNCPTR(ImeSelect); + if (!ptr->pImeSelect || !ptr->pImeDestroy) + { + FreeLibrary(ptr->hIME); + ptr->hIME = NULL; + } + else + { + LOAD_FUNCPTR(ImeConfigure); + LOAD_FUNCPTR(ImeEscape); + LOAD_FUNCPTR(ImeSetActiveContext); + LOAD_FUNCPTR(ImeToAsciiEx); + LOAD_FUNCPTR(NotifyIME); + LOAD_FUNCPTR(ImeRegisterWord); + LOAD_FUNCPTR(ImeUnregisterWord); + LOAD_FUNCPTR(ImeEnumRegisterWord); + LOAD_FUNCPTR(ImeSetCompositionString); + LOAD_FUNCPTR(ImeConversionList); + LOAD_FUNCPTR(ImeProcessKey); + LOAD_FUNCPTR(ImeGetRegisterWordStyle); + LOAD_FUNCPTR(ImeGetImeMenuItems); + /* make sure our classname is WCHAR */ + if (!is_kbd_ime_unicode(ptr)) + { + WCHAR bufW[17]; + MultiByteToWideChar(CP_ACP, 0, (LPSTR)ptr->imeClassName, + -1, bufW, 17); + lstrcpyW(ptr->imeClassName, bufW); + } + } } } list_add_head(&ImmHklList,&ptr->entry); [View Less]

1 0

Aric Stewart : imm32: Implement ImmConfigureIME using the loaded IME.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 467ab8a0650486346ef21adb2d6c254a645ee752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=467ab8a0650486346ef21adb2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 2 13:46:45 2008 -0500 imm32: Implement ImmConfigureIME using the loaded IME. --- dlls/imm32/imm.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 74 insertions(+), 10 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c … [View More]index 4ba1d63..ba8dbfc 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -121,6 +121,32 @@ static void ImmInternalPostIMEMessage(InputContextData*, UINT, WPARAM, LPARAM); static void ImmInternalSetOpenStatus(BOOL fOpen); static HIMCC updateResultStr(HIMCC old, LPWSTR resultstr, DWORD len); +#define is_kbd_ime_unicode(p) (p->imeInfo.fdwProperty & IME_PROP_UNICODE) + +static inline WCHAR *strdupAtoW( const char *str ) +{ + WCHAR *ret = NULL; + if (str) + { + DWORD len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); + if ((ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + MultiByteToWideChar( CP_ACP, 0, str, -1, ret, len ); + } + return ret; +} + +static inline CHAR *strdupWtoA( const WCHAR *str ) +{ + CHAR *ret = NULL; + if (str) + { + DWORD len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL ); + if ((ret = HeapAlloc( GetProcessHeap(), 0, len ))) + WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL ); + } + return ret; +} + /* ImmHkl loading and freeing */ #define LOAD_FUNCPTR(f) if((ptr->p##f = (LPVOID)GetProcAddress(ptr->hIME, #f)) == NULL){WARN("Can't find function %s in ime\n", #f);} static ImmHkl *IMM_GetImmHkl(HKL hkl) @@ -702,11 +728,30 @@ BOOL WINAPI ImmAssociateContextEx(HWND hWnd, HIMC hIMC, DWORD dwFlags) BOOL WINAPI ImmConfigureIMEA( HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData) { - FIXME("(%p, %p, %d, %p): stub\n", - hKL, hWnd, dwMode, lpData - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + ImmHkl *immHkl = IMM_GetImmHkl(hKL); + + TRACE("(%p, %p, %d, %p):\n", hKL, hWnd, dwMode, lpData); + + if (immHkl->hIME && immHkl->pImeConfigure) + { + if (dwMode != IME_CONFIG_REGISTERWORD || !is_kbd_ime_unicode(immHkl)) + return immHkl->pImeConfigure(hKL,hWnd,dwMode,lpData); + else + { + REGISTERWORDW rww; + REGISTERWORDA *rwa = (REGISTERWORDA*)lpData; + BOOL rc; + + rww.lpReading = strdupAtoW(rwa->lpReading); + rww.lpWord = strdupAtoW(rwa->lpWord); + rc = immHkl->pImeConfigure(hKL,hWnd,dwMode,&rww); + HeapFree(GetProcessHeap(),0,rww.lpReading); + HeapFree(GetProcessHeap(),0,rww.lpWord); + return rc; + } + } + else + return FALSE; } /*********************************************************************** @@ -715,11 +760,30 @@ BOOL WINAPI ImmConfigureIMEA( BOOL WINAPI ImmConfigureIMEW( HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData) { - FIXME("(%p, %p, %d, %p): stub\n", - hKL, hWnd, dwMode, lpData - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + ImmHkl *immHkl = IMM_GetImmHkl(hKL); + + TRACE("(%p, %p, %d, %p):\n", hKL, hWnd, dwMode, lpData); + + if (immHkl->hIME && immHkl->pImeConfigure) + { + if (dwMode != IME_CONFIG_REGISTERWORD || is_kbd_ime_unicode(immHkl)) + return immHkl->pImeConfigure(hKL,hWnd,dwMode,lpData); + else + { + REGISTERWORDW *rww = (REGISTERWORDW*)lpData; + REGISTERWORDA rwa; + BOOL rc; + + rwa.lpReading = strdupWtoA(rww->lpReading); + rwa.lpWord = strdupWtoA(rww->lpWord); + rc = immHkl->pImeConfigure(hKL,hWnd,dwMode,&rwa); + HeapFree(GetProcessHeap(),0,rwa.lpReading); + HeapFree(GetProcessHeap(),0,rwa.lpWord); + return rc; + } + } + else + return FALSE; } /*********************************************************************** [View Less]

1 0

Aric Stewart : winex11: Add IME functionality to winex11drv.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 6dca48feaf8ea0cedd2df88af98f28179d096c02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dca48feaf8ea0cedd2df88af… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 2 10:13:59 2008 -0500 winex11: Add IME functionality to winex11drv. All XIM interaction will soon pass through this functionality instead of directly to imm32. --- dlls/winex11.drv/Makefile.in | 3 +- dlls/winex11.drv/ime.c | 1425 +++++++++++++… [View More]

1 0

Reece Dunn : tools/msvcmaker: Suppress deprecation warnings on VC8 and above.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: d03f4d2a49aeada7f53e877d691c881180a474a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d03f4d2a49aeada7f53e877d6… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Sun Apr 6 14:27:30 2008 +0100 tools/msvcmaker: Suppress deprecation warnings on VC8 and above. --- tools/winapi/msvcmaker | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index 325339b..… [View More]

1 0

Dmitry Timoshkov : winex11.drv: Do not set window type to utility to avoid a Metacity bug.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 1bf824e0b00d2b179d5f34dd0c7ace83e83bd28a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bf824e0b00d2b179d5f34dd0… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 7 22:17:47 2008 +0900 winex11.drv: Do not set window type to utility to avoid a Metacity bug. --- dlls/winex11.drv/window.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index … [View More]

1 0

Dmitry Timoshkov : gdi32: Move negative lfWidth test into a separate body, skip the test if there is no 'x' in the font.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 0fdd381f26b6c03008235b4481e9561f7c6a99da URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fdd381f26b6c03008235b448… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 7 21:24:47 2008 +0900 gdi32: Move negative lfWidth test into a separate body, skip the test if there is no 'x' in the font. --- dlls/gdi32/tests/font.c | 108 +++++++++++++++++++++++++++++------------------ 1 files changed, 67 insertions(+), 41 deletions(-)… [View More] diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index a91adcb..ef250d9 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1494,6 +1494,71 @@ else ReleaseDC(0, hdc); } +static void test_negative_width(HDC hdc, const LOGFONTA *lf) +{ + HFONT hfont, hfont_prev; + DWORD ret; + GLYPHMETRICS gm1, gm2; + LOGFONTA lf2 = *lf; + WORD idx; + MAT2 mat = { {0,1}, {0,0}, {0,0}, {0,1} }; + + /* negative widths are handled just as positive ones */ + lf2.lfWidth = -lf->lfWidth; + + SetLastError(0xdeadbeef); + hfont = CreateFontIndirectA(lf); + ok(hfont != 0, "CreateFontIndirect error %u\n", GetLastError()); + check_font("original", lf, hfont); + + hfont_prev = SelectObject(hdc, hfont); + + ret = GetGlyphIndicesA(hdc, "x", 1, &idx, GGI_MARK_NONEXISTING_GLYPHS); + if (ret == GDI_ERROR || idx == 0xffff) + { + SelectObject(hdc, hfont_prev); + DeleteObject(hfont); + skip("This font doesn't contain 'x', skipping the test\n"); + return; + } + + /* filling with 0xaa causes false pass under WINEDEBUG=warn+heap */ + memset(&gm1, 0xab, sizeof(gm1)); + SetLastError(0xdeadbeef); + ret = GetGlyphOutlineA(hdc, 'x', GGO_METRICS, &gm1, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutline error 0x%x\n", GetLastError()); + + SelectObject(hdc, hfont_prev); + DeleteObject(hfont); + + SetLastError(0xdeadbeef); + hfont = CreateFontIndirectA(&lf2); + ok(hfont != 0, "CreateFontIndirect error %u\n", GetLastError()); + check_font("negative width", &lf2, hfont); + + hfont_prev = SelectObject(hdc, hfont); + + memset(&gm2, 0xbb, sizeof(gm2)); + SetLastError(0xdeadbeef); + ret = GetGlyphOutlineA(hdc, 'x', GGO_METRICS, &gm2, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutline error 0x%x\n", GetLastError()); + + SelectObject(hdc, hfont_prev); + DeleteObject(hfont); + + ok(gm1.gmBlackBoxX == gm2.gmBlackBoxX && + gm1.gmBlackBoxY == gm2.gmBlackBoxY && + gm1.gmptGlyphOrigin.x == gm2.gmptGlyphOrigin.x && + gm1.gmptGlyphOrigin.y == gm2.gmptGlyphOrigin.y && + gm1.gmCellIncX == gm2.gmCellIncX && + gm1.gmCellIncY == gm2.gmCellIncY, + "gm1=%d,%d,%d,%d,%d,%d gm2=%d,%d,%d,%d,%d,%d\n", + gm1.gmBlackBoxX, gm1.gmBlackBoxY, gm1.gmptGlyphOrigin.x, + gm1.gmptGlyphOrigin.y, gm1.gmCellIncX, gm1.gmCellIncY, + gm2.gmBlackBoxX, gm2.gmBlackBoxY, gm2.gmptGlyphOrigin.x, + gm2.gmptGlyphOrigin.y, gm2.gmCellIncX, gm2.gmCellIncY); +} + /* PANOSE is 10 bytes in size, need to pack the structure properly */ #include "pshpack2.h" typedef struct @@ -1578,47 +1643,6 @@ static void test_text_metrics(const LOGFONTA *lf) hfont_old = SelectObject(hdc, hfont); - if(lf->lfWidth > 0) { - HFONT hfont2, hfont_prev; - GLYPHMETRICS gm1, gm2; - LOGFONTA lf2 = *lf; - MAT2 mat2 = { {0,1}, {0,0}, {0,0}, {0,1} }; - - /* negative widths are handled just as positive ones */ - lf2.lfWidth *= -1; - - SetLastError(0xdeadbeef); - hfont2 = CreateFontIndirectA(&lf2); - ok(hfont2 != 0, "CreateFontIndirect error %u\n", GetLastError()); - hfont_prev = SelectObject(hdc, hfont2); - - /* filling with 0xaa causes false pass under WINEDEBUG=warn+heap */ - memset(&gm1, 0xab, sizeof(gm1)); - SetLastError(0xdeadbeef); - ret = GetGlyphOutlineA(hdc, 'x', GGO_METRICS, &gm1, 0, NULL, &mat2); - ok(ret != GDI_ERROR, "GetGlyphOutline error 0x%x\n", GetLastError()); - - SelectObject(hdc, hfont_prev); - DeleteObject(hfont2); - - memset(&gm2, 0xbb, sizeof(gm2)); - SetLastError(0xdeadbeef); - ret = GetGlyphOutlineA(hdc, 'x', GGO_METRICS, &gm2, 0, NULL, &mat2); - ok(ret != GDI_ERROR, "GetGlyphOutline error 0x%x\n", GetLastError()); - - ok(gm1.gmBlackBoxX == gm2.gmBlackBoxX && - gm1.gmBlackBoxY == gm2.gmBlackBoxY && - gm1.gmptGlyphOrigin.x == gm2.gmptGlyphOrigin.x && - gm1.gmptGlyphOrigin.y == gm2.gmptGlyphOrigin.y && - gm1.gmCellIncX == gm2.gmCellIncX && - gm1.gmCellIncY == gm2.gmCellIncY, - "gm1=%d,%d,%d,%d,%d,%d gm2=%d,%d,%d,%d,%d,%d\n", - gm1.gmBlackBoxX, gm1.gmBlackBoxY, gm1.gmptGlyphOrigin.x, - gm1.gmptGlyphOrigin.y, gm1.gmCellIncX, gm1.gmCellIncY, - gm2.gmBlackBoxX, gm2.gmBlackBoxY, gm2.gmptGlyphOrigin.x, - gm2.gmptGlyphOrigin.y, gm2.gmCellIncX, gm2.gmCellIncY); - } - size = GetFontData(hdc, MS_OS2_TAG, 0, NULL, 0); if (size == GDI_ERROR) { @@ -1711,6 +1735,8 @@ static void test_text_metrics(const LOGFONTA *lf) tmW.tmDigitizedAspectX, ret); } + test_negative_width(hdc, lf); + end_of_test: SelectObject(hdc, hfont_old); DeleteObject(hfont); [View Less]

1 0

Dmitry Timoshkov : gdi32: Fix lfWidth before caching the font to avoid duplicate entries in the cache .
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: c5d07b7c228e3243e39859669b66a50c8871952b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5d07b7c228e3243e39859669… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 7 21:23:55 2008 +0900 gdi32: Fix lfWidth before caching the font to avoid duplicate entries in the cache. --- dlls/gdi32/freetype.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c … [View More]

1 0

Alexandre Julliard : user32: Fix list_window_parents when run in the desktop process.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: cf4c2e0b5453c0297ea749dd841e7587c99feb71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf4c2e0b5453c0297ea749dd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 7 20:34:24 2008 +0200 user32: Fix list_window_parents when run in the desktop process. --- dlls/user32/win.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index aa5bd87..a1f3024 100644 --- a/… [View More]

1 0

Alexandre Julliard : libwine: Only use the last line of the git version description.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 85241fbe5bdd76aaeff8dc74b41a0a3fb2b2c949 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85241fbe5bdd76aaeff8dc74b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 7 17:38:27 2008 +0200 libwine: Only use the last line of the git version description. --- libs/wine/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index ea74396..8b614d7 … [View More]

1 0

Alexandre Julliard : winex11: Don't set NET_WM_STATE on the desktop window.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 334e88bc02305362c473ad362521f7801cdb86e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=334e88bc02305362c473ad362… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 7 17:34:47 2008 +0200 winex11: Don't set NET_WM_STATE on the desktop window. --- dlls/winex11.drv/winpos.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 0ef4601..065c501 … [View More]

1 0

Marcus Meissner : adjusted my entry in who
by Jeremy Newman 07 Apr '08

07 Apr '08

Module: website Branch: master Commit: 0f5a96951700cb243e3e2c8a3aa97dce9330b22c URL: http://source.winehq.org/git/website.git/?a=commit;h=0f5a96951700cb243e3e2c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Apr 6 19:36:03 2008 +0200 adjusted my entry in who --- templates/en/who.template | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/templates/en/who.template b/templates/en/who.template index 76cb502..70fe288 100644 --- a/… [View More]

1 0

Andrew Talbot : advapi32: Do not call MIDL_user_free() with pointer to stack memory.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 2ae8e87616d58fbcce647a013679b8b48dc35e72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ae8e87616d58fbcce647a013… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Apr 5 23:46:41 2008 +0100 advapi32: Do not call MIDL_user_free() with pointer to stack memory. --- dlls/advapi32/service.c | 16 ++++++++++------ dlls/advapi32/tests/service.c | 4 ++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --… [View More]

1 0

Francois Gouget : fusion/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: e1ee7a3b8b17f56fd282d89c89017a6b981b6d10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1ee7a3b8b17f56fd282d89c8… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 7 11:03:32 2008 +0200 fusion/tests: Fix compilation on systems that don't support nameless unions. --- dlls/fusion/tests/asmcache.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/fusion/tests/asmcache.c b/dlls/… [View More]

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 8a18e0e43a1b7e5acddc5ed9aa76fcc7f07d9a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a18e0e43a1b7e5acddc5ed9a… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 7 13:01:02 2008 +0200 Assorted spelling fixes. --- dlls/kernel32/nls/rmc.nls | 2 +- dlls/oleaut32/tests/olefont.c | 2 +- dlls/oleaut32/tests/vartest.c | 2 +- dlls/oleaut32/typelib.c | 2 +- dlls/user32/tests/winstation.c … [View More]

1 0

Francois Gouget : wineboot: Make sure COBJMACROS is defined before objidl. h is included.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 93b450d4ec413aeb46040cd21b4eea0ff87c36ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=93b450d4ec413aeb46040cd21… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 7 11:03:22 2008 +0200 wineboot: Make sure COBJMACROS is defined before objidl.h is included. --- programs/wineboot/wineboot.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index … [View More]

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 0d0c4a355b06fecf5860b1c1d51335b61de9f8de URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d0c4a355b06fecf5860b1c1d… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 7 11:03:27 2008 +0200 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/visual.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/… [View More]dlls/ddraw/tests/visual.c index 41d6062..b63231b 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -1733,13 +1733,13 @@ static void p8_surface_fill_rect(IDirectDrawSurface *dest, UINT x, UINT y, UINT hr = IDirectDrawSurface_Lock(dest, NULL, &ddsd, DDLOCK_WRITEONLY | DDLOCK_WAIT, NULL); ok(hr==DD_OK, "IDirectDrawSurface_Lock returned: %x\n", hr); - p = (BYTE *)ddsd.lpSurface + ddsd.lPitch * y + x; + p = (BYTE *)ddsd.lpSurface + U1(ddsd).lPitch * y + x; for (i = 0; i < h; i++) { for (i1 = 0; i1 < w; i1++) { p[i1] = colorindex; } - p += ddsd.lPitch; + p += U1(ddsd).lPitch; } hr = IDirectDrawSurface_Unlock(dest, NULL); @@ -1956,11 +1956,11 @@ static void p8_primary_test() for (i = 0; i < 256; i++) { unsigned x = (i % 128) * 4; unsigned y = (i / 128) * 4; - BYTE *p = (BYTE *)ddsd.lpSurface + ddsd.lPitch * y + x; + BYTE *p = (BYTE *)ddsd.lpSurface + U1(ddsd).lPitch * y + x; for (i1 = 0; i1 < 4; i1++) { p[0] = p[1] = p[2] = p[3] = i; - p += ddsd.lPitch; + p += U1(ddsd).lPitch; } } @@ -2007,7 +2007,7 @@ static void p8_primary_test() for (i = 0; i < 256; i++) { unsigned x = (i % 128) * 4 + 1; unsigned y = (i / 128) * 4 + 1; - BYTE *p = (BYTE *)ddsd.lpSurface + ddsd.lPitch * y + x; + BYTE *p = (BYTE *)ddsd.lpSurface + U1(ddsd).lPitch * y + x; if (*p != i) differences++; } @@ -2086,24 +2086,24 @@ static void cubemap_test(IDirect3DDevice7 *device) memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); - ddsd.ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_CAPS; ddsd.dwWidth = 16; ddsd.dwHeight = 16; ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX; ddsd.ddsCaps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES | DDSCAPS2_TEXTUREMANAGE; - ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; - ddsd.ddpfPixelFormat.dwRGBBitCount = 32; - ddsd.ddpfPixelFormat.dwRBitMask = 0x00FF0000; - ddsd.ddpfPixelFormat.dwGBitMask = 0x0000FF00; - ddsd.ddpfPixelFormat.dwBBitMask = 0x000000FF; + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00FF0000; + U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000FF00; + U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000FF; hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &cubemap, NULL); ok(hr == DD_OK, "IDirectDraw7_CreateSurface returned %08x\n", hr); IDirectDraw7_Release(ddraw); /* Positive X */ - DDBltFx.dwFillColor = 0x00ff0000; + U5(DDBltFx).dwFillColor = 0x00ff0000; hr = IDirectDrawSurface7_Blt(cubemap, NULL, NULL, NULL, DDBLT_COLORFILL, &DDBltFx); ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned %08x\n", hr); @@ -2112,35 +2112,35 @@ static void cubemap_test(IDirect3DDevice7 *device) caps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_NEGATIVEX; hr = IDirectDrawSurface_GetAttachedSurface(cubemap, &caps, &surface); ok(hr == DD_OK, "IDirectDrawSurface7_Lock returned %08x\n", hr); - DDBltFx.dwFillColor = 0x0000ffff; + U5(DDBltFx).dwFillColor = 0x0000ffff; hr = IDirectDrawSurface7_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL, &DDBltFx); ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned %08x\n", hr); caps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_NEGATIVEZ; hr = IDirectDrawSurface_GetAttachedSurface(cubemap, &caps, &surface); ok(hr == DD_OK, "IDirectDrawSurface7_Lock returned %08x\n", hr); - DDBltFx.dwFillColor = 0x0000ff00; + U5(DDBltFx).dwFillColor = 0x0000ff00; hr = IDirectDrawSurface7_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL, &DDBltFx); ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned %08x\n", hr); caps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_POSITIVEZ; hr = IDirectDrawSurface_GetAttachedSurface(cubemap, &caps, &surface); ok(hr == DD_OK, "IDirectDrawSurface7_Lock returned %08x\n", hr); - DDBltFx.dwFillColor = 0x000000ff; + U5(DDBltFx).dwFillColor = 0x000000ff; hr = IDirectDrawSurface7_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL, &DDBltFx); ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned %08x\n", hr); caps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_NEGATIVEY; hr = IDirectDrawSurface_GetAttachedSurface(cubemap, &caps, &surface); ok(hr == DD_OK, "IDirectDrawSurface7_Lock returned %08x\n", hr); - DDBltFx.dwFillColor = 0x00ffff00; + U5(DDBltFx).dwFillColor = 0x00ffff00; hr = IDirectDrawSurface7_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL, &DDBltFx); ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned %08x\n", hr); caps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_POSITIVEY; hr = IDirectDrawSurface_GetAttachedSurface(cubemap, &caps, &surface); ok(hr == DD_OK, "IDirectDrawSurface7_Lock returned %08x\n", hr); - DDBltFx.dwFillColor = 0x00ff00ff; + U5(DDBltFx).dwFillColor = 0x00ff00ff; hr = IDirectDrawSurface7_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL, &DDBltFx); ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned %08x\n", hr); [View Less]

1 0

Jacek Caban : jscript: Added IObjectSafety implementation.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 7d95c210c891755cdc1c0eb0608c91ee2e108dec URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d95c210c891755cdc1c0eb06… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 7 12:35:41 2008 +0200 jscript: Added IObjectSafety implementation. --- dlls/jscript/jscript.c | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 7d7385a..f058e26 … [View More]100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -32,6 +32,8 @@ typedef struct { const IObjectSafetyVtbl *lpIObjectSafetyVtbl; LONG ref; + + DWORD safeopt; } JScript; #define ACTSCRIPT(x) ((IActiveScript*) &(x)->lpIActiveScriptVtbl) @@ -395,19 +397,35 @@ static ULONG WINAPI JScriptSafety_Release(IObjectSafety *iface) return IActiveScript_Release(ACTSCRIPT(This)); } +#define SUPPORTED_OPTIONS (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER) + static HRESULT WINAPI JScriptSafety_GetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, DWORD *pdwSupportedOptions, DWORD *pdwEnabledOptions) { JScript *This = OBJSAFETY_THIS(iface); - FIXME("(%p)->(%s %p %p)\n", This, debugstr_guid(riid), pdwSupportedOptions, pdwEnabledOptions); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p %p)\n", This, debugstr_guid(riid), pdwSupportedOptions, pdwEnabledOptions); + + if(!pdwSupportedOptions || !pdwEnabledOptions) + return E_POINTER; + + *pdwSupportedOptions = SUPPORTED_OPTIONS; + *pdwEnabledOptions = This->safeopt; + + return S_OK; } static HRESULT WINAPI JScriptSafety_SetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, DWORD dwOptionSetMask, DWORD dwEnabledOptions) { JScript *This = OBJSAFETY_THIS(iface); - FIXME("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), dwOptionSetMask, dwEnabledOptions); + + TRACE("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), dwOptionSetMask, dwEnabledOptions); + + if(dwOptionSetMask & ~SUPPORTED_OPTIONS) + return E_FAIL; + + This->safeopt = dwEnabledOptions & dwEnabledOptions; return S_OK; } @@ -439,6 +457,7 @@ HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUn ret->lpIActiveScriptPropertyVtbl = &JScriptPropertyVtbl; ret->lpIObjectSafetyVtbl = &JScriptSafetyVtbl; ret->ref = 1; + ret->safeopt = INTERFACE_USES_DISPEX; hres = IActiveScript_QueryInterface(ACTSCRIPT(ret), riid, ppv); IActiveScript_Release(ACTSCRIPT(ret)); [View Less]

1 0

Jacek Caban : mshtml: Remove unneeded includes.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: d02c37aa4e4d1d3b0efaa4166bdbd230534b44bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d02c37aa4e4d1d3b0efaa4166… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 7 13:14:05 2008 +0200 mshtml: Remove unneeded includes. --- dlls/mshtml/conpoint.c | 3 --- dlls/mshtml/editor.c | 3 --- dlls/mshtml/hlink.c | 3 --- dlls/mshtml/htmlanchor.c | 3 --- dlls/mshtml/htmlbody.c | 3 --- … [View More] dlls/mshtml/htmlelem.c | 3 --- dlls/mshtml/htmlelem2.c | 4 ---- dlls/mshtml/htmlinput.c | 4 ---- dlls/mshtml/htmlnode.c | 4 ---- dlls/mshtml/htmloption.c | 4 ---- dlls/mshtml/htmlscript.c | 4 ---- dlls/mshtml/htmlselect.c | 4 ---- dlls/mshtml/htmlstyle.c | 4 ---- dlls/mshtml/htmlstylesheet.c | 4 ---- dlls/mshtml/htmltable.c | 4 ---- dlls/mshtml/htmltextarea.c | 4 ---- dlls/mshtml/htmlwindow.c | 4 ---- dlls/mshtml/main.c | 3 --- dlls/mshtml/olecmd.c | 4 ---- dlls/mshtml/selection.c | 4 ---- dlls/mshtml/txtrange.c | 4 ---- 21 files changed, 0 insertions(+), 77 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index 85cf8dc..0c77e9c 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -16,10 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 756898a..5929603 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include <stdio.h> @@ -26,7 +24,6 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "mshtmcid.h" diff --git a/dlls/mshtml/hlink.c b/dlls/mshtml/hlink.c index 80332a1..60056e3 100644 --- a/dlls/mshtml/hlink.c +++ b/dlls/mshtml/hlink.c @@ -16,10 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 41b71e7..d404925 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include <stdio.h> @@ -26,7 +24,6 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "wine/debug.h" diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 6ad26ee..2ca3f28 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include <stdio.h> @@ -26,7 +24,6 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "wine/debug.h" diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 145a625..b7fac23 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -16,10 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> -#include <stdio.h> #define COBJMACROS @@ -27,7 +25,6 @@ #include "winbase.h" #include "winuser.h" #include "winreg.h" -#include "winnls.h" #include "ole2.h" #include "shlwapi.h" diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 333f66f..01c88fa 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -16,17 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "wine/debug.h" diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index e6b1798..9c390c8 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -16,17 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "wine/debug.h" diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 1633baa..e098a83 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -16,17 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "wine/debug.h" diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index 0c84989..73af3b0 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -16,17 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "wine/debug.h" diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 5bf4a18..6c49af5 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -16,17 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "wine/debug.h" diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 3a7faf8..3718e8a 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -16,17 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "wine/debug.h" diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index bf3cb4a..cb24831 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -16,17 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "wine/debug.h" diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 236831e..b074c25 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -16,17 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "wine/debug.h" diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index ffef38a..66d55d0 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -16,17 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "wine/debug.h" diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 5aaa9d4..64245e7 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -16,17 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "wine/debug.h" diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 63dbbc0..0f57069 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -16,17 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "wine/debug.h" diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index e69672f..0389833 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -20,8 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include <stdio.h> @@ -30,7 +28,6 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "winreg.h" #include "ole2.h" #include "advpub.h" diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index afc3cc8..0b1b477 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -16,17 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "shlguid.h" #include "mshtmdid.h" diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index 7de8adf..5eca8e3 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -16,17 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "wine/debug.h" diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index df8ee55..72b9ce0 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -16,17 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "mshtmcid.h" [View Less]

1 0

Jacek Caban : mshtml: Don't crash if nsWebBrowser could not be created.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: b024cd6de26174fd379efb769906b08c9d12f629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b024cd6de26174fd379efb769… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 7 13:05:56 2008 +0200 mshtml: Don't crash if nsWebBrowser could not be created. --- dlls/mshtml/nsembed.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 5d9b247..e46b8fa … [View More]

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::get_navigator implementation.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 9c352a11cc4425053b58ea978e6931e9e1cb11cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c352a11cc4425053b58ea978… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 7 12:34:24 2008 +0200 mshtml: Added IHTMLWindow2::get_navigator implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlwindow.c | 7 +- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/omnavigator.c | 309 ++++++++++++++++++++++++++… [View More]

1 0

Francois Gouget : services: Add a trailing '\n' to a couple of Wine traces.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 1aa72f7e47607e6c553dcb4064cc16475ab0574b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aa72f7e47607e6c553dcb406… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 7 11:03:01 2008 +0200 services: Add a trailing '\n' to a couple of Wine traces. --- programs/services/rpc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 63ce0d7..0adeb12 100644 --… [View More]

1 0

Austin English : Spelling fixes.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: f4c4488df822b0d109998a99d8282b4d364b9ca9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4c4488df822b0d109998a99d… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Apr 4 14:23:01 2008 -0500 Spelling fixes. --- dlls/ddraw/main.c | 2 +- dlls/ddraw/tests/visual.c | 8 ++++---- dlls/dplayx/dplayx_global.c | 2 +- dlls/iphlpapi/iphlpapi_main.c | 4 ++-- dlls/mapi32/prop.c | 6 +++--- … [View More]

1 0

Vitaliy Margolen : winex11: Properly report state of the caps-lock and num-lock and scroll-lock keys.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: bc325ac268ab0b99e1ce6d5012dd329cacb2357c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc325ac268ab0b99e1ce6d501… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 5 23:36:55 2008 -0600 winex11: Properly report state of the caps-lock and num-lock and scroll-lock keys. --- dlls/winex11.drv/keyboard.c | 134 +++++++++++++++---------------------------- 1 files changed, 46 insertions(+), 88 deletions(-) diff --git a/… [View More]dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index f11a9ee..4be6336 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1139,8 +1139,6 @@ static WORD EVENT_event_to_vkey( XIC xic, XKeyEvent *e) return keyc2vkey[e->keycode]; } -static BOOL NumState=FALSE, CapsState=FALSE; - /*********************************************************************** * X11DRV_send_keyboard_input @@ -1265,53 +1263,6 @@ void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD dwFlags, DWORD time } -/********************************************************************** - * KEYBOARD_GenerateMsg - * - * Generate Down+Up messages when NumLock or CapsLock is pressed. - * - * Convention : called with vkey only VK_NUMLOCK or VK_CAPITAL - * - */ -static void KEYBOARD_GenerateMsg( WORD vkey, WORD scan, int Evtype, DWORD event_time ) -{ - BOOL * State = (vkey==VK_NUMLOCK? &NumState : &CapsState); - DWORD up, down; - - if (*State) { - /* The INTERMEDIARY state means : just after a 'press' event, if a 'release' event comes, - don't treat it. It's from the same key press. Then the state goes to ON. - And from there, a 'release' event will switch off the toggle key. */ - *State=FALSE; - TRACE("INTERM : don't treat release of toggle key. key_state_table[%#x] = %#x\n", - vkey,key_state_table[vkey]); - } else - { - down = (vkey==VK_NUMLOCK ? KEYEVENTF_EXTENDEDKEY : 0); - up = (vkey==VK_NUMLOCK ? KEYEVENTF_EXTENDEDKEY : 0) | KEYEVENTF_KEYUP; - if ( key_state_table[vkey] & 0x1 ) /* it was ON */ - { - if (Evtype!=KeyPress) - { - TRACE("ON + KeyRelease => generating DOWN and UP messages.\n"); - X11DRV_send_keyboard_input( vkey, scan, down, event_time, 0, 0 ); - X11DRV_send_keyboard_input( vkey, scan, up, event_time, 0, 0 ); - *State=FALSE; - key_state_table[vkey] &= ~0x01; /* Toggle state to off. */ - } - } - else /* it was OFF */ - if (Evtype==KeyPress) - { - TRACE("OFF + Keypress => generating DOWN and UP messages.\n"); - X11DRV_send_keyboard_input( vkey, scan, down, event_time, 0, 0 ); - X11DRV_send_keyboard_input( vkey, scan, up, event_time, 0, 0 ); - *State=TRUE; /* Goes to intermediary state before going to ON */ - key_state_table[vkey] |= 0x01; /* Toggle state to on. */ - } - } -} - /*********************************************************************** * KEYBOARD_UpdateOneState * @@ -1370,6 +1321,16 @@ void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) KEYBOARD_UpdateOneState( VK_SHIFT, shift, time ); } +static void update_lock_state(BYTE vkey, WORD scan, DWORD time) +{ + DWORD flags = vkey == VK_NUMLOCK ? KEYEVENTF_EXTENDEDKEY : 0; + + if (key_state_table[vkey] & 0x80) flags ^= KEYEVENTF_KEYUP; + + X11DRV_send_keyboard_input( vkey, scan, flags, time, 0, 0 ); + X11DRV_send_keyboard_input( vkey, scan, flags ^ KEYEVENTF_KEYUP, time, 0, 0 ); +} + /*********************************************************************** * X11DRV_KeyEvent * @@ -1443,47 +1404,44 @@ void X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) TRACE_(key)("keycode 0x%x converted to vkey 0x%x\n", event->keycode, vkey); - if (vkey) - { - switch (vkey & 0xff) - { - case VK_NUMLOCK: - KEYBOARD_GenerateMsg( VK_NUMLOCK, 0x45, event->type, event_time ); - break; - case VK_CAPITAL: - TRACE("Caps Lock event. (type %d). State before : %#.2x\n",event->type,key_state_table[vkey]); - KEYBOARD_GenerateMsg( VK_CAPITAL, 0x3A, event->type, event_time ); - TRACE("State after : %#.2x\n",key_state_table[vkey]); - break; - default: - /* Adjust the NUMLOCK state if it has been changed outside wine */ - if (!(key_state_table[VK_NUMLOCK] & 0x01) != !(event->state & NumLockMask)) - { - TRACE("Adjusting NumLock state.\n"); - KEYBOARD_GenerateMsg( VK_NUMLOCK, 0x45, KeyPress, event_time ); - KEYBOARD_GenerateMsg( VK_NUMLOCK, 0x45, KeyRelease, event_time ); - } - /* Adjust the CAPSLOCK state if it has been changed outside wine */ - if (!(key_state_table[VK_CAPITAL] & 0x01) != !(event->state & LockMask)) - { - TRACE("Adjusting Caps Lock state.\n"); - KEYBOARD_GenerateMsg( VK_CAPITAL, 0x3A, KeyPress, event_time ); - KEYBOARD_GenerateMsg( VK_CAPITAL, 0x3A, KeyRelease, event_time ); - } - /* Not Num nor Caps : end of intermediary states for both. */ - NumState = FALSE; - CapsState = FALSE; + if (!vkey) return; + + dwFlags = 0; + if ( event->type == KeyRelease ) dwFlags |= KEYEVENTF_KEYUP; + if ( vkey & 0x100 ) dwFlags |= KEYEVENTF_EXTENDEDKEY; + - bScan = keyc2scan[event->keycode] & 0xFF; - TRACE_(key)("bScan = 0x%02x.\n", bScan); + /* Note: X sets the below states on key down and clears them on key up. + Windows triggers them on key down. */ - dwFlags = 0; - if ( event->type == KeyRelease ) dwFlags |= KEYEVENTF_KEYUP; - if ( vkey & 0x100 ) dwFlags |= KEYEVENTF_EXTENDEDKEY; + /* Adjust the CAPSLOCK state if it has been changed outside wine */ + if (!(key_state_table[VK_CAPITAL] & 0x01) != !(event->state & LockMask) && + vkey != VK_CAPITAL) + { + TRACE("Adjusting CapsLock state (%#.2x)\n", key_state_table[VK_CAPITAL]); + update_lock_state(VK_CAPITAL, 0x3A, event_time); + } + + /* Adjust the NUMLOCK state if it has been changed outside wine */ + if (!(key_state_table[VK_NUMLOCK] & 0x01) != !(event->state & NumLockMask) && + (vkey & 0xff) != VK_NUMLOCK) + { + TRACE("Adjusting NumLock state (%#.2x)\n", key_state_table[VK_NUMLOCK]); + update_lock_state(VK_NUMLOCK, 0x45, event_time); + } - X11DRV_send_keyboard_input( vkey & 0xff, bScan, dwFlags, event_time, 0, 0 ); + /* Adjust the SCROLLLOCK state if it has been changed outside wine */ + if (!(key_state_table[VK_SCROLL] & 0x01) != !(event->state & ScrollLockMask) && + vkey != VK_SCROLL) + { + TRACE("Adjusting ScrLock state (%#.2x)\n", key_state_table[VK_SCROLL]); + update_lock_state(VK_SCROLL, 0x46, event_time); } - } + + bScan = keyc2scan[event->keycode] & 0xFF; + TRACE_(key)("bScan = 0x%02x.\n", bScan); + + X11DRV_send_keyboard_input( vkey & 0xff, bScan, dwFlags, event_time, 0, 0 ); } /********************************************************************** [View Less]

1 0

Vitaliy Margolen : winex11: Get the ScrollLock mask.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: b4d99eebbbca50263a083e0bea602781762179b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4d99eebbbca50263a083e0be… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Apr 6 08:25:38 2008 -0600 winex11: Get the ScrollLock mask. --- dlls/winex11.drv/keyboard.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 8bb5717..f11a9ee 100644 … [View More]

1 0

Dmitry Timoshkov : winex11: Change the priority of evaluated window styles to workaround a Metacity bug with handling of utility windows .
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 751a71a0449e44a603894fa7e8b6dc27fb31c014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=751a71a0449e44a603894fa7e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 7 13:37:44 2008 +0900 winex11: Change the priority of evaluated window styles to workaround a Metacity bug with handling of utility windows. --- dlls/winex11.drv/window.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/… [View More]

1 0

Dmitry Timoshkov : gdi32: Fully initialize face->ntmFlags on font load.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 1f35b6e62ef920e2f783cbfa86bdc337f17e3c5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f35b6e62ef920e2f783cbfa8… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 7 16:11:42 2008 +0900 gdi32: Fully initialize face->ntmFlags on font load. --- dlls/gdi32/freetype.c | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index … [View More]0284a00..be8688a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -256,11 +256,9 @@ typedef struct tagFace { void *font_data_ptr; DWORD font_data_size; FT_Long face_index; - BOOL Italic; - BOOL Bold; FONTSIGNATURE fs; FONTSIGNATURE fs_links; - DWORD ntmFlags; /* Only some bits stored here. Others are computed on the fly */ + DWORD ntmFlags; FT_Fixed font_version; BOOL scalable; Bitmap_Size size; /* set if face is a bitmap */ @@ -1380,8 +1378,12 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ face->font_data_size = font_data_size; } face->face_index = face_index; - face->Italic = (ft_face->style_flags & FT_STYLE_FLAG_ITALIC) ? 1 : 0; - face->Bold = (ft_face->style_flags & FT_STYLE_FLAG_BOLD) ? 1 : 0; + face->ntmFlags = 0; + if (ft_face->style_flags & FT_STYLE_FLAG_ITALIC) + face->ntmFlags |= NTM_ITALIC; + if (ft_face->style_flags & FT_STYLE_FLAG_BOLD) + face->ntmFlags |= NTM_BOLD; + if (face->ntmFlags == 0) face->ntmFlags = NTM_REGULAR; face->font_version = pHeader ? pHeader->Font_Revision : 0; face->family = family; face->external = (flags & ADDFONT_EXTERNAL_FONT) ? TRUE : FALSE; @@ -1409,10 +1411,8 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ if (pFT_Load_Sfnt_Table && !pFT_Load_Sfnt_Table(ft_face, FT_MAKE_TAG('C','F','F',' '), 0, NULL, &tmp_size)) { TRACE("Font %s/%p is OTF Type1\n", wine_dbgstr_a(file), font_data_ptr); - face->ntmFlags = NTM_PS_OPENTYPE; + face->ntmFlags |= NTM_PS_OPENTYPE; } - else - face->ntmFlags = 0; TRACE("fsCsb = %08x %08x/%08x %08x %08x %08x\n", face->fs.fsCsb[0], face->fs.fsCsb[1], @@ -3335,11 +3335,15 @@ found: { if((csi.fs.fsCsb[0] & (face->fs.fsCsb[0] | face->fs_links.fsCsb[0])) || !csi.fs.fsCsb[0]) { - new_score = (face->Italic ^ it) + (face->Bold ^ bd); + BOOL italic, bold; + + italic = (face->ntmFlags & NTM_ITALIC) ? 1 : 0; + bold = (face->ntmFlags & NTM_BOLD) ? 1 : 0; + new_score = (italic ^ it) + (bold ^ bd); if(!best || new_score <= score) { TRACE("(it=%d, bd=%d) is selected for (it=%d, bd=%d)\n", - face->Italic, face->Bold, it, bd); + italic, bold, it, bd); score = new_score; best = face; if(best->scalable && score == 0) break; @@ -3363,8 +3367,8 @@ found: } if(best) face = best->scalable ? best : best_bitmap; - ret->fake_italic = (it && !face->Italic); - ret->fake_bold = (bd && !face->Bold); + ret->fake_italic = (it && !(face->ntmFlags & NTM_ITALIC)); + ret->fake_bold = (bd && !(face->ntmFlags & NTM_BOLD)); ret->fs = face->fs; [View Less]

1 0

Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1?=) : progman: Updated Korean resource.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: a96ad868ff88f15f21796c3f10fa698167dcd444 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a96ad868ff88f15f21796c3f1… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Apr 7 09:27:12 2008 +0900 progman: Updated Korean resource. --- programs/progman/Ko.rc | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/programs/progman/Ko.rc b/programs/progman/Ko.rc index b0a56f4..600e8e4 100644 --- a/programs/… [View More]progman/Ko.rc +++ b/programs/progman/Ko.rc @@ -69,7 +69,6 @@ DIALOG_NEW DIALOG 0, 0, 170, 65 LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "�� ۾�" -FONT 9, "MS Shell Dlg" { RADIOBUTTON "", PM_NEW_GROUP, 10, 15, 10, 15 LTEXT "Ǯ�׸� �׷�(&G)", PM_NEW_GROUP, 20, 18, 80, 15 @@ -86,7 +85,6 @@ PUSHBUTTON " LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ǯ�׸� �̵�" -FONT 9, "MS Shell Dlg" { LTEXT "Ǯ�׸� �̵�:", IDIGNORE, 5, 5, 90, 15 LTEXT "", PM_PROGRAM, 95, 5, 90, 15 @@ -105,7 +103,6 @@ DIALOG_COPY DIALOG 0, 0, 250, 65 LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ǯ�׸� ��" -FONT 9, "MS Shell Dlg" { LTEXT "Ǯ�׸� ��:", IDIGNORE, 5, 5, 90, 15 LTEXT "", PM_PROGRAM, 95, 5, 90, 15 @@ -124,7 +121,6 @@ DIALOG_GROUP DIALOG 0, 0, 230, 65 LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ǯ�׸� �׷� �Ӽ�" -FONT 9, "MS Shell Dlg" { LTEXT "��(&D):", PM_DESCRIPTION_TXT, 05, 18, 50, 10 EDITTEXT PM_DESCRIPTION, 60, 18, 90, 15, WS_TABSTOP @@ -141,7 +137,6 @@ DIALOG_PROGRAM DIALOG 0, 0, 250, 105 LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ǯ�׸� �Ӽ�" -FONT 9, "MS Shell Dlg" { LTEXT "��(&D):", PM_DESCRIPTION_TXT, 05, 10, 60, 10 EDITTEXT PM_DESCRIPTION, 80, 10, 90, 15, WS_TABSTOP @@ -167,7 +162,6 @@ DIALOG_SYMBOL DIALOG 0, 0, 200, 85 LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "�� ٲٱ�" -FONT 9, "MS Shell Dlg" { LTEXT "��̸�(&F):", PM_ICON_FILE_TXT, 5, 15, 40, 10 EDITTEXT PM_ICON_FILE, 45, 15, 85, 15, WS_TABSTOP @@ -186,7 +180,6 @@ DIALOG_EXECUTE DIALOG 0, 0, 200, 85 LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ǯ�׸� ��" -FONT 9, "MS Shell Dlg" { LTEXT "�� (&C):", IDIGNORE, 05, 15, 120, 10 EDITTEXT PM_COMMAND, 05, 25, 120, 15, WS_TABSTOP [View Less]

1 0

Alexander Nicolaysen Sørnes : shell32: Update Norwegian Bokmål resource.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: bc9f05f50b0ec6691d0a20034ad31be3752d3b73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc9f05f50b0ec6691d0a20034… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Apr 6 22:17:38 2008 +0200 shell32: Update Norwegian Bokmål resource. --- dlls/shell32/shell32_No.rc | 29 ++++++++++++++++++++++++----- 1 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shell32_No.rc b/dlls/shell32/… [View More]shell32_No.rc index 413d072..c1160eb 100644 --- a/dlls/shell32/shell32_No.rc +++ b/dlls/shell32/shell32_No.rc @@ -136,17 +136,19 @@ FONT 8, "MS Shell Dlg" LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 } -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 +SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 220, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Om %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 60, 12, WS_TABSTOP + PUSHBUTTON "Lisens . . .", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30 - LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 137, 10 - LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 137, 10 - LTEXT "Wine er laget av", IDC_ABOUT_WINE_TEXT, 8, 55, 137, 10 + LTEXT "", IDC_ABOUT_STATIC_TEXT1, 42, 10, 170, 10 + LTEXT "", IDC_ABOUT_STATIC_TEXT2, 42, 22, 170, 10 + LTEXT "Kj�rer p� %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 + LTEXT "Wine er laget av", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 } SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -248,3 +250,20 @@ STRINGTABLE IDS_NEWFOLDER "Ny mappe" } + +STRINGTABLE +{ +IDS_LICENSE_CAPTION, "Lisensbetingelser" +IDS_LICENSE, +"Wine er fri programvare; du kan distribuere det og/eller \ +endre det i henhold til vilk�rene i �GNU Lesser General Public \ +License�, utgitt av the Free Software Foundation; enten \ +versjon 2.1 av Lisensen, eller (hvis du �nsker det) en nyere versjon.\n\n\ +Wine utgis i h�p om at det er nyttig, \ +men UTEN ENHVER GARANTI; uten engang den antydede garantien om \ +HANDELSEGNETHET eller EGNETHET FOR ET SPESIELT FORM�L. Se �GNU \ +Lesser General Public License� for flere detaljer.\n\n\ +Du skal ha mottatt et eksemplar av �GNU Lesser General Public \ +License� sammen med dette programmet; hvis ikke, skriv til: the Free Software \ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." +} [View Less]

1 0

Alexander Nicolaysen Sørnes : oledlg: Fix control class in Norwegian Bokmål resource.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 7d712909bb90cf1c347cdb79050ee015d66b3f6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d712909bb90cf1c347cdb790… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Apr 6 22:05:52 2008 +0200 oledlg: Fix control class in Norwegian Bokmål resource. --- dlls/oledlg/oledlg_No.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oledlg/oledlg_No.rc b/dlls/oledlg/oledlg_No.rc index … [View More]

1 0

Alexander Nicolaysen Sørnes : comdlg32: Update Norwegian Bokmål resource.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 0f3921886088ec80633931a552d7d109631503ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f3921886088ec80633931a55… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Apr 6 22:00:13 2008 +0200 comdlg32: Update Norwegian Bokmål resource. --- dlls/comdlg32/cdlg_No.rc | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/cdlg_No.rc b/dlls/comdlg32/cdlg_No.rc index ce8013c..… [View More]

1 0

Roderick Colenbrander : wined3d: Remove a PBO when a converted surface is detected.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: f04d870a8d9dcadd6d4db3864ddb914a9ced555b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f04d870a8d9dcadd6d4db3864… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Apr 5 23:54:26 2008 +0000 wined3d: Remove a PBO when a converted surface is detected. This can happen e.g. when suddenly color keying is activated and at some stages we don't know if we will need conversion at PBO creation time. --- dlls/wined3d/surface.c |… [View More] 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 33812b7..ddd0f32 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -36,6 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, CONVERT_TYPES convert, IWineD3DSurfaceImpl *surf); static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4], BOOL colorkey); static inline void clear_unused_channels(IWineD3DSurfaceImpl *This); +static void surface_remove_pbo(IWineD3DSurfaceImpl *This); static void surface_bind_and_dirtify(IWineD3DSurfaceImpl *This) { GLint active_texture; @@ -4038,6 +4039,13 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D width = This->currentDesc.Width; pitch = IWineD3DSurface_GetPitch(iface); + /* Don't use PBOs for converted surfaces. During PBO conversion we look at SFLAG_CONVERTED + * but it isn't set (yet) in all cases it is getting called. */ + if((convert != NO_CONVERSION) && (This->Flags & SFLAG_PBO)) { + TRACE("Removing the pbo attached to surface %p\n", This); + surface_remove_pbo(This); + } + if((convert != NO_CONVERSION) && This->resource.allocatedMemory) { int height = This->currentDesc.Height; @@ -4092,6 +4100,13 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D width = This->currentDesc.Width; pitch = IWineD3DSurface_GetPitch(iface); + /* Don't use PBOs for converted surfaces. During PBO conversion we look at SFLAG_CONVERTED + * but it isn't set (yet) in all cases it is getting called. */ + if((convert != NO_CONVERSION) && (This->Flags & SFLAG_PBO)) { + TRACE("Removing the pbo attached to surface %p\n", This); + surface_remove_pbo(This); + } + if((convert != NO_CONVERSION) && This->resource.allocatedMemory) { int height = This->currentDesc.Height; [View Less]

1 0

Roderick Colenbrander : wined3d: Use the render target its palette when performing a texture copy as the texture doesn 't hold one.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 0efefef34b7e0eae68d90683a2cd8f1d3d94ed7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0efefef34b7e0eae68d90683a… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Apr 3 22:45:28 2008 +0000 wined3d: Use the render target its palette when performing a texture copy as the texture doesn't hold one. --- dlls/wined3d/surface.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/… [View More]

1 0

Hans Leidekker : winebrowser: Convert to Unicode.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: e547cf7043e36fecfe5e23d1d6f93a9c5ba89c46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e547cf7043e36fecfe5e23d1d… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Apr 6 14:44:31 2008 +0200 winebrowser: Convert to Unicode. --- programs/winebrowser/Makefile.in | 2 +- programs/winebrowser/main.c | 164 +++++++++++++++++++++++-------------- 2 files changed, 103 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e547cf7043e36fecfe5e2…

1 0

Rico Schüller : d3d9: fix two copy and paste mistakes.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 29713df8d93bf8cfc1b97b5d6e790c263a3bd4a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29713df8d93bf8cfc1b97b5d6… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Apr 6 10:37:22 2008 +0200 d3d9: fix two copy and paste mistakes. --- dlls/d3d9/tests/visual.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 6d9ad39..76623e6 100644 --- a/dlls/d3d9/… [View More]

1 0

Rico Schüller : d3d9: Make the shader test more precision tolerant.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 82521353f5f898f4a19ce65afaec55dfe732caca URL: http://source.winehq.org/git/wine.git/?a=commit;h=82521353f5f898f4a19ce65af… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Apr 6 00:14:00 2008 +0200 d3d9: Make the shader test more precision tolerant. --- dlls/d3d9/tests/visual.c | 54 ++++++++++++++++++++++++++++++--------------- 1 files changed, 36 insertions(+), 18 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/… [View More]visual.c index b33f7d5..6d9ad39 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -4801,31 +4801,37 @@ static void cnd_test(IDirect3DDevice9 *device) color = getPixelColor(device, 158, 358); ok(color == 0x00ffffff, "pixel 158, 358 has color %08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 162, 358); - ok(color == 0x00000000, "pixel 162, 358 has color %08x, expected 0x00000000\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) <= 0x01) && ((color & 0x000000ff) <= 0x01), + "pixel 162, 358 has color %08x, expected 0x00000000\n", color); color = getPixelColor(device, 158, 362); ok(color == 0x00ffffff, "pixel 158, 362 has color %08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 162, 362); - ok(color == 0x00000000, "pixel 162, 362 has color %08x, expected 0x00000000\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) <= 0x01) && ((color & 0x000000ff) <= 0x01), + "pixel 162, 362 has color %08x, expected 0x00000000\n", color); /* 1.2 shader */ color = getPixelColor(device, 478, 358); ok(color == 0x00ffffff, "pixel 478, 358 has color %08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 482, 358); - ok(color == 0x00000000, "pixel 482, 358 has color %08x, expected 0x00000000\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) <= 0x01) && ((color & 0x000000ff) <= 0x01), + "pixel 482, 358 has color %08x, expected 0x00000000\n", color); color = getPixelColor(device, 478, 362); ok(color == 0x00ffffff, "pixel 478, 362 has color %08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 482, 362); - ok(color == 0x00000000, "pixel 482, 362 has color %08x, expected 0x00000000\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) <= 0x01) && ((color & 0x000000ff) <= 0x01), + "pixel 482, 362 has color %08x, expected 0x00000000\n", color); /* 1.3 shader */ color = getPixelColor(device, 478, 118); ok(color == 0x00ffffff, "pixel 478, 118 has color %08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 482, 118); - ok(color == 0x00000000, "pixel 482, 118 has color %08x, expected 0x00000000\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) <= 0x01) && ((color & 0x000000ff) <= 0x01), + "pixel 482, 118 has color %08x, expected 0x00000000\n", color); color = getPixelColor(device, 478, 122); ok(color == 0x00ffffff, "pixel 478, 122 has color %08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 482, 122); - ok(color == 0x00000000, "pixel 482, 122 has color %08x, expected 0x00000000\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) <= 0x01) && ((color & 0x000000ff) <= 0x01), + "pixel 482, 122 has color %08x, expected 0x00000000\n", color); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ffff, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %s\n", DXGetErrorString9(hr)); @@ -4878,33 +4884,45 @@ static void cnd_test(IDirect3DDevice9 *device) /* 1.1 shader. coissue flag changed the semantic of cnd, c1 is always selected */ color = getPixelColor(device, 158, 358); - ok(color == 0x0000ff00, "pixel 158, 358 has color %08x, expected 0x0000ff00\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + "pixel 158, 358 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 162, 358); - ok(color == 0x0000ff00, "pixel 162, 358 has color %08x, expected 0x0000ff00\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + "pixel 162, 358 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 158, 362); - ok(color == 0x0000ff00, "pixel 158, 362 has color %08x, expected 0x0000ff00\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + "pixel 158, 362 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 162, 362); - ok(color == 0x0000ff00, "pixel 162, 362 has color %08x, expected 0x0000ff00\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + "pixel 162, 362 has color %08x, expected 0x0000ff00\n", color); /* 1.2 shader */ color = getPixelColor(device, 478, 358); - ok(color == 0x0000ff00, "pixel 478, 358 has color %08x, expected 0x0000ff00\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + "pixel 478, 358 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 482, 358); - ok(color == 0x0000ff00, "pixel 482, 358 has color %08x, expected 0x0000ff00\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + "pixel 482, 358 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 478, 362); - ok(color == 0x0000ff00, "pixel 478, 362 has color %08x, expected 0x0000ff00\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + "pixel 478, 362 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 482, 362); - ok(color == 0x0000ff00, "pixel 482, 362 has color %08x, expected 0x0000ff00\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + "pixel 482, 362 has color %08x, expected 0x0000ff00\n", color); /* 1.3 shader */ color = getPixelColor(device, 478, 118); - ok(color == 0x0000ff00, "pixel 478, 118 has color %08x, expected 0x0000ff00\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + "pixel 478, 118 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 482, 118); - ok(color == 0x0000ff00, "pixel 482, 118 has color %08x, expected 0x0000ff00\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + "pixel 482, 118 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 478, 122); - ok(color == 0x0000ff00, "pixel 478, 122 has color %08x, expected 0x0000ff00\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + "pixel 478, 122 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 482, 122); - ok(color == 0x0000ff00, "pixel 482, 122 has color %08x, expected 0x0000ff00\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + "pixel 482, 122 has color %08x, expected 0x0000ff00\n", color); IDirect3DPixelShader9_Release(shader_14_coissue); IDirect3DPixelShader9_Release(shader_13_coissue); [View Less]

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