September 2009 - Wine-commits

Alistair Leslie-Hughes : msxml3: Add IDispatchEx support to IXMLDOMElement.
by Alexandre Julliard 10 Sep '09

10 Sep '09

Module: wine Branch: master Commit: 30087f9660f0ff76318b7c0a6c55ba730e63acea URL: http://source.winehq.org/git/wine.git/?a=commit;h=30087f9660f0ff76318b7c0a6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Aug 31 15:18:00 2009 +1000 msxml3: Add IDispatchEx support to IXMLDOMElement. --- dlls/msxml3/element.c | 18 +++++++++++++++++- dlls/msxml3/tests/domdoc.c | 2 ++ 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 6590e5b..531d43e 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -74,6 +74,10 @@ static HRESULT WINAPI domelem_QueryInterface( { *ppvObject = IXMLDOMNode_from_impl(This->node); } + else if(dispex_query_interface(&This->node->dispex, riid, ppvObject)) + { + return *ppvObject ? S_OK : E_NOINTERFACE; + } else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); @@ -751,6 +755,18 @@ static const struct IXMLDOMElementVtbl domelem_vtbl = domelem_normalize, }; +static const tid_t domelem_iface_tids[] = { + IXMLDOMElement_tid, + 0 +}; + +static dispex_static_data_t domelem_dispex = { + NULL, + IXMLDOMElement_tid, + NULL, + domelem_iface_tids +}; + IUnknown* create_element( xmlNodePtr element ) { domelem *This; @@ -762,7 +778,7 @@ IUnknown* create_element( xmlNodePtr element ) This->lpVtbl = &domelem_vtbl; This->ref = 1; - This->node = create_basic_node( element, (IUnknown*)&This->lpVtbl, NULL ); + This->node = create_basic_node( element, (IUnknown*)&This->lpVtbl, &domelem_dispex ); if(!This->node) { HeapFree(GetProcessHeap(), 0, This); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 91e34f5..469a4f9 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -599,6 +599,8 @@ static void test_domdoc( void ) IObjectIdentity *ident; BSTR tag = NULL; + test_disp((IUnknown*)element); + r = IXMLDOMElement_QueryInterface( element, &IID_IObjectIdentity, (LPVOID*)&ident ); ok( r == E_NOINTERFACE, "ret %08x\n", r);

1 0

Dan Kegel : ntdll: Add tests for NtQueryInformationFile.
by Alexandre Julliard 10 Sep '09

10 Sep '09

Module: wine Branch: master Commit: 398a8ea1fec599cfd6442e3b8bba620431cf53b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=398a8ea1fec599cfd6442e3b8… Author: Dan Kegel <dank(a)kegel.com> Date: Wed Sep 9 05:41:30 2009 -0700 ntdll: Add tests for NtQueryInformationFile. --- dlls/ntdll/tests/file.c | 133 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 133 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 26a854a..48b9ce8 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -64,6 +64,7 @@ static NTSTATUS (WINAPI *pNtQueryIoCompletion)(HANDLE, IO_COMPLETION_INFORMATION static NTSTATUS (WINAPI *pNtRemoveIoCompletion)(HANDLE, PULONG_PTR, PULONG_PTR, PIO_STATUS_BLOCK, PLARGE_INTEGER); static NTSTATUS (WINAPI *pNtSetIoCompletion)(HANDLE, ULONG_PTR, ULONG_PTR, NTSTATUS, ULONG); static NTSTATUS (WINAPI *pNtSetInformationFile)(HANDLE, PIO_STATUS_BLOCK, PVOID, ULONG, FILE_INFORMATION_CLASS); +static NTSTATUS (WINAPI *pNtQueryInformationFile)(HANDLE, PIO_STATUS_BLOCK, PVOID, ULONG, FILE_INFORMATION_CLASS); static inline BOOL is_signaled( HANDLE obj ) { @@ -787,6 +788,134 @@ static void test_iocp_fileio(HANDLE h) CloseHandle( hPipeClt ); } +static void test_file_basic_information(void) +{ + IO_STATUS_BLOCK io; + FILE_BASIC_INFORMATION fbi; + HANDLE h; + int res; + + if (!(h = create_temp_file(0))) return; + + /* Check default first */ + memset(&fbi, 0, sizeof(fbi)); + res = pNtQueryInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation); + ok ( res == STATUS_SUCCESS, "can't get attributes, res %x\n", res); + ok ( fbi.FileAttributes == FILE_ATTRIBUTE_ARCHIVE, "attribute %x not FILE_ATTRIBUTE_ARCHIVE\n", fbi.FileAttributes ); + + /* Then SYSTEM */ + /* Clear fbi to avoid setting times */ + memset(&fbi, 0, sizeof(fbi)); + fbi.FileAttributes = FILE_ATTRIBUTE_SYSTEM; + res = pNtSetInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation); + ok ( res == STATUS_SUCCESS, "can't set system attribute\n"); + + memset(&fbi, 0, sizeof(fbi)); + res = pNtQueryInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation); + ok ( res == STATUS_SUCCESS, "can't get attributes\n"); + todo_wine ok ( fbi.FileAttributes == FILE_ATTRIBUTE_SYSTEM, "attribute %x not FILE_ATTRIBUTE_SYSTEM\n", fbi.FileAttributes ); + + /* Then HIDDEN */ + memset(&fbi, 0, sizeof(fbi)); + fbi.FileAttributes = FILE_ATTRIBUTE_HIDDEN; + res = pNtSetInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation); + ok ( res == STATUS_SUCCESS, "can't set system attribute\n"); + + memset(&fbi, 0, sizeof(fbi)); + res = pNtQueryInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation); + ok ( res == STATUS_SUCCESS, "can't get attributes\n"); + todo_wine ok ( fbi.FileAttributes == FILE_ATTRIBUTE_HIDDEN, "attribute %x not FILE_ATTRIBUTE_HIDDEN\n", fbi.FileAttributes ); + + /* Check NORMAL last of all (to make sure we can clear attributes) */ + memset(&fbi, 0, sizeof(fbi)); + fbi.FileAttributes = FILE_ATTRIBUTE_NORMAL; + res = pNtSetInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation); + ok ( res == STATUS_SUCCESS, "can't set normal attribute\n"); + + memset(&fbi, 0, sizeof(fbi)); + res = pNtQueryInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation); + ok ( res == STATUS_SUCCESS, "can't get attributes\n"); + todo_wine ok ( fbi.FileAttributes == FILE_ATTRIBUTE_NORMAL, "attribute %x not FILE_ATTRIBUTE_NORMAL\n", fbi.FileAttributes ); + + CloseHandle( h ); +} + +static void test_file_all_information(void) +{ + IO_STATUS_BLOCK io; + /* FileAllInformation, like FileNameInformation, has a variable-length pathname + * buffer at the end. Vista objects with STATUS_BUFFER_OVERFLOW if you + * don't leave enough room there. + */ + struct { + FILE_ALL_INFORMATION fai; + WCHAR buf[256]; + } fai_buf; + HANDLE h; + int res; + + if (!(h = create_temp_file(0))) return; + + /* Check default first */ + res = pNtQueryInformationFile(h, &io, &fai_buf.fai, sizeof fai_buf, FileAllInformation); + ok ( res == STATUS_SUCCESS, "can't get attributes, res %x\n", res); + ok ( fai_buf.fai.BasicInformation.FileAttributes == FILE_ATTRIBUTE_ARCHIVE, "attribute %x not FILE_ATTRIBUTE_ARCHIVE\n", fai_buf.fai.BasicInformation.FileAttributes ); + + /* Then SYSTEM */ + /* Clear fbi to avoid setting times */ + memset(&fai_buf.fai.BasicInformation, 0, sizeof(fai_buf.fai.BasicInformation)); + fai_buf.fai.BasicInformation.FileAttributes = FILE_ATTRIBUTE_SYSTEM; + res = pNtSetInformationFile(h, &io, &fai_buf.fai, sizeof fai_buf, FileAllInformation); + ok ( res == STATUS_NOT_IMPLEMENTED, "shouldn't be able to set FileAllInformation, res %x\n", res); + res = pNtSetInformationFile(h, &io, &fai_buf.fai.BasicInformation, sizeof fai_buf.fai.BasicInformation, FileBasicInformation); + ok ( res == STATUS_SUCCESS, "can't set system attribute\n"); + + memset(&fai_buf.fai, 0, sizeof(fai_buf.fai)); + res = pNtQueryInformationFile(h, &io, &fai_buf.fai, sizeof fai_buf, FileAllInformation); + ok ( res == STATUS_SUCCESS, "can't get attributes, res %x\n", res); + todo_wine ok ( fai_buf.fai.BasicInformation.FileAttributes == FILE_ATTRIBUTE_SYSTEM, "attribute %x not FILE_ATTRIBUTE_SYSTEM\n", fai_buf.fai.BasicInformation.FileAttributes ); + + /* Then HIDDEN */ + memset(&fai_buf.fai.BasicInformation, 0, sizeof(fai_buf.fai.BasicInformation)); + fai_buf.fai.BasicInformation.FileAttributes = FILE_ATTRIBUTE_HIDDEN; + res = pNtSetInformationFile(h, &io, &fai_buf.fai.BasicInformation, sizeof fai_buf.fai.BasicInformation, FileBasicInformation); + ok ( res == STATUS_SUCCESS, "can't set system attribute\n"); + + memset(&fai_buf.fai, 0, sizeof(fai_buf.fai)); + res = pNtQueryInformationFile(h, &io, &fai_buf.fai, sizeof fai_buf, FileAllInformation); + ok ( res == STATUS_SUCCESS, "can't get attributes\n"); + todo_wine ok ( fai_buf.fai.BasicInformation.FileAttributes == FILE_ATTRIBUTE_HIDDEN, "attribute %x not FILE_ATTRIBUTE_HIDDEN\n", fai_buf.fai.BasicInformation.FileAttributes ); + + /* Check NORMAL last of all (to make sure we can clear attributes) */ + memset(&fai_buf.fai.BasicInformation, 0, sizeof(fai_buf.fai.BasicInformation)); + fai_buf.fai.BasicInformation.FileAttributes = FILE_ATTRIBUTE_NORMAL; + res = pNtSetInformationFile(h, &io, &fai_buf.fai.BasicInformation, sizeof fai_buf.fai.BasicInformation, FileBasicInformation); + ok ( res == STATUS_SUCCESS, "can't set normal attribute\n"); + + memset(&fai_buf.fai, 0, sizeof(fai_buf.fai)); + res = pNtQueryInformationFile(h, &io, &fai_buf.fai, sizeof fai_buf, FileAllInformation); + ok ( res == STATUS_SUCCESS, "can't get attributes\n"); + todo_wine ok ( fai_buf.fai.BasicInformation.FileAttributes == FILE_ATTRIBUTE_NORMAL, "attribute %x not FILE_ATTRIBUTE_NORMAL\n", fai_buf.fai.BasicInformation.FileAttributes ); + + CloseHandle( h ); +} + +static void test_file_both_information(void) +{ + IO_STATUS_BLOCK io; + FILE_BOTH_DIR_INFORMATION fbi; + HANDLE h; + int res; + + if (!(h = create_temp_file(0))) return; + + memset(&fbi, 0, sizeof(fbi)); + res = pNtQueryInformationFile(h, &io, &fbi, sizeof fbi, FileBothDirectoryInformation); + ok ( res == STATUS_NOT_IMPLEMENTED, "whoops, vista doesn't implement this one?\n"); + + CloseHandle( h ); +} + static void test_iocompletion(void) { HANDLE h = INVALID_HANDLE_VALUE; @@ -830,9 +959,13 @@ START_TEST(file) pNtRemoveIoCompletion = (void *)GetProcAddress(hntdll, "NtRemoveIoCompletion"); pNtSetIoCompletion = (void *)GetProcAddress(hntdll, "NtSetIoCompletion"); pNtSetInformationFile = (void *)GetProcAddress(hntdll, "NtSetInformationFile"); + pNtQueryInformationFile = (void *)GetProcAddress(hntdll, "NtQueryInformationFile"); delete_file_test(); read_file_test(); nt_mailslot_test(); test_iocompletion(); + test_file_basic_information(); + test_file_all_information(); + test_file_both_information(); }

1 0

Chris Robinson : openal32: Add thunks for EFX functions.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 1ebce128c5f8412d9c290944018835829570b75f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ebce128c5f8412d9c2909440… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Aug 25 05:40:40 2009 -0700 openal32: Add thunks for EFX functions. --- dlls/openal32/openal.c | 282 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 282 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ebce128c5f8412d9c290…

1 0

Chris Robinson : openal32: Wrap and track OpenAL contexts.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: fbafa5d8f5137bec9e5468f3d7ac405ba3220c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbafa5d8f5137bec9e5468f3d… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Aug 25 18:55:53 2009 -0700 openal32: Wrap and track OpenAL contexts. --- dlls/openal32/openal.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 112 insertions(+), 3 deletions(-) diff --git a/dlls/openal32/openal.c b/dlls/openal32/openal.c index 840498d..6e48375 100644 --- a/dlls/openal32/openal.c +++ b/dlls/openal32/openal.c @@ -36,6 +36,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(openal32); +typedef struct wine_ALCcontext { + ALCcontext *ctx; + + struct wine_ALCcontext *next; +} wine_ALCcontext; struct FuncList { const char *name; @@ -45,6 +50,18 @@ struct FuncList { static const struct FuncList ALCFuncs[]; static const struct FuncList ALFuncs[]; +static wine_ALCcontext *CtxList; +static wine_ALCcontext *CurrentCtx; + +CRITICAL_SECTION openal_cs; +static CRITICAL_SECTION_DEBUG openal_cs_debug = +{ + 0, 0, &openal_cs, + {&openal_cs_debug.ProcessLocksList, + &openal_cs_debug.ProcessLocksList}, + 0, 0, {(DWORD_PTR)(__FILE__ ": openal_cs")} +}; +CRITICAL_SECTION openal_cs = {&openal_cs_debug, -1, 0, 0, 0, 0}; /*********************************************************************** * OpenAL initialisation routine @@ -56,12 +73,30 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinst); break; + case DLL_PROCESS_DETACH: + while(CtxList) + { + wine_ALCcontext *next = CtxList->next; + HeapFree(GetProcessHeap(), 0, CtxList); + CtxList = next; + } } return TRUE; } +/* Validates the given context */ +static wine_ALCcontext *ValidateCtx(ALCcontext *ctx) +{ + wine_ALCcontext *cur = CtxList; + + while(cur != NULL && cur->ctx != ctx) + cur = cur->next; + return cur; +} + + /*********************************************************************** * OpenAL thunk routines */ @@ -69,12 +104,55 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) /* OpenAL ALC 1.0 functions */ ALCcontext* CDECL wine_alcCreateContext(ALCdevice *device, const ALCint* attrlist) { - return alcCreateContext(device, attrlist); + wine_ALCcontext *ctx; + + ctx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(wine_ALCcontext)); + if(!ctx) + { + ERR("Out of memory!\n"); + return NULL; + } + + ctx->ctx = alcCreateContext(device, attrlist); + if(!ctx->ctx) + { + HeapFree(GetProcessHeap(), 0, ctx); + WARN("Failed to create new context\n"); + return NULL; + } + TRACE("Created new context %p\n", ctx->ctx); + + EnterCriticalSection(&openal_cs); + ctx->next = CtxList; + CtxList = ctx; + LeaveCriticalSection(&openal_cs); + + return ctx->ctx; } ALCboolean CDECL wine_alcMakeContextCurrent(ALCcontext *context) { - return alcMakeContextCurrent(context); + wine_ALCcontext *ctx = NULL; + + EnterCriticalSection(&openal_cs); + if(context && !(ctx=ValidateCtx(context))) + { + FIXME("Could not find context %p in context list\n", context); + LeaveCriticalSection(&openal_cs); + return ALC_FALSE; + } + + if(alcMakeContextCurrent(ctx ? ctx->ctx : NULL) == ALC_FALSE) + { + WARN("Failed to make context %p current\n", ctx->ctx); + LeaveCriticalSection(&openal_cs); + return ALC_FALSE; + } + + CurrentCtx = ctx; + LeaveCriticalSection(&openal_cs); + + return ALC_TRUE; } ALvoid CDECL wine_alcProcessContext(ALCcontext *context) @@ -89,12 +167,43 @@ ALvoid CDECL wine_alcSuspendContext(ALCcontext *context) ALvoid CDECL wine_alcDestroyContext(ALCcontext *context) { + wine_ALCcontext **list, *ctx; + + EnterCriticalSection(&openal_cs); + + list = &CtxList; + while(*list && (*list)->ctx != context) + list = &(*list)->next; + + if(!(*list)) + { + FIXME("Could not find context %p in context list\n", context); + LeaveCriticalSection(&openal_cs); + return; + } + + ctx = *list; + *list = (*list)->next; + + if(ctx == CurrentCtx) + CurrentCtx = NULL; + + LeaveCriticalSection(&openal_cs); + + HeapFree(GetProcessHeap(), 0, ctx); alcDestroyContext(context); } ALCcontext* CDECL wine_alcGetCurrentContext(ALCvoid) { - return alcGetCurrentContext(); + ALCcontext *ret = NULL; + + EnterCriticalSection(&openal_cs); + if(CurrentCtx) + ret = CurrentCtx->ctx; + LeaveCriticalSection(&openal_cs); + + return ret; } ALCdevice* CDECL wine_alcGetContextsDevice(ALCcontext *context)

1 0

Chris Robinson : openal32: Fill out thunk functions.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: d973953bbf8000bb81df1c2196b54046812c63d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d973953bbf8000bb81df1c219… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Aug 25 04:30:25 2009 -0700 openal32: Fill out thunk functions. --- dlls/openal32/openal.c | 625 ++++++++++++++++++++++++++++++++++++++++++- dlls/openal32/openal32.spec | 186 +++++++------- 2 files changed, 716 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d973953bbf8000bb81df1…

1 0

Chris Robinson : openal32: Add a stub DLL thunk.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 862965f4f71b19f251934b11d1e998831ccbaee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=862965f4f71b19f251934b11d… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Aug 25 03:26:35 2009 -0700 openal32: Add a stub DLL thunk. --- configure | 73 ++++++++++++++++++++++++++++++++ configure.ac | 13 ++++++ dlls/openal32/Makefile.in | 14 ++++++ dlls/openal32/openal.c | 47 +++++++++++++++++++++ dlls/openal32/openal32.spec | 97 +++++++++++++++++++++++++++++++++++++++++++ include/config.h.in | 3 + 6 files changed, 247 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=862965f4f71b19f251934…

1 0

Vladimir Pankratov : jscript: Add Russian translation.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 8f78ff29612c70992c1e0d2aaf38f694d12e04da URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f78ff29612c70992c1e0d2aa… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Wed Sep 2 15:53:44 2009 +0500 jscript: Add Russian translation. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/jscript_Ru.rc | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index e1e164f..241ef4b 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -12,6 +12,7 @@ RC_SRCS = \ jscript_Lt.rc \ jscript_Nl.rc \ jscript_Pt.rc \ + jscript_Ru.rc \ rsrc.rc C_SRCS = \ diff --git a/dlls/jscript/jscript_Ru.rc b/dlls/jscript/jscript_Ru.rc new file mode 100644 index 0000000..998c715 --- /dev/null +++ b/dlls/jscript/jscript_Ru.rc @@ -0,0 +1,44 @@ +/* + * Copyright 2009 Vladimir Pankratov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TO_PRIMITIVE "Ошибка конвертирования обьекта в примитивный тип" + IDS_INVALID_CALL_ARG "Неверный вызов процедуры или аргумент" + IDS_NO_PROPERTY "Обьект не поддерживает это свойство или метод" + IDS_ARG_NOT_OPT "Отсутствует обязательный аргумент" + IDS_SYNTAX_ERROR "Синтаксическая ошибка" + IDS_SEMICOLON "Ожидается ';'" + IDS_LBRACKET "Ожидается '('" + IDS_RBRACKET "Ожидается ')'" + IDS_UNTERMINATED_STR "Незавершённая строковая константа" + IDS_NOT_FUNC "Ожидается функция" + IDS_NOT_DATE "'[object]' не обьект типа 'date'" + IDS_NOT_NUM "Ожидается число" + IDS_ILLEGAL_ASSIGN "Неверное присваивание" + IDS_UNDEFINED "'|' не определён" + IDS_NOT_BOOL "Ожидается обьект типа 'bool'" + IDS_INVALID_LENGTH "Длиной массива должно быть конечное положительное число" +}

1 0

Roderick Colenbrander : winex11: Add helper function for calculating ColorShifts.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 4ef7bd69438016563153bc718c5baebf9e25548a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ef7bd69438016563153bc718… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sat Sep 5 16:49:05 2009 +0200 winex11: Add helper function for calculating ColorShifts. --- dlls/winex11.drv/palette.c | 23 ++++++++++++++++------- dlls/winex11.drv/x11drv.h | 1 + 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index 57174a7..2f3600f 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -101,7 +101,6 @@ int *X11DRV_PALETTE_XPixelToPalette = NULL; static BOOL X11DRV_PALETTE_BuildPrivateMap( const PALETTEENTRY *sys_pal_template ); static BOOL X11DRV_PALETTE_BuildSharedMap( const PALETTEENTRY *sys_pal_template ); -static void X11DRV_PALETTE_ComputeShifts(unsigned long maskbits, ChannelShift *physical, ChannelShift *to_logical); static void X11DRV_PALETTE_FillDefaultColors( const PALETTEENTRY *sys_pal_template ); static void X11DRV_PALETTE_FormatSystemPalette(void); static BOOL X11DRV_PALETTE_CheckSysColor( const PALETTEENTRY *sys_pal_template, COLORREF c); @@ -223,9 +222,7 @@ int X11DRV_PALETTE_Init(void) X11DRV_PALETTE_PaletteXColormap = XCreateColormap(gdi_display, root_window, visual, AllocNone); X11DRV_PALETTE_PaletteFlags |= X11DRV_PALETTE_FIXED; - X11DRV_PALETTE_ComputeShifts(visual->red_mask, &X11DRV_PALETTE_default_shifts.physicalRed, &X11DRV_PALETTE_default_shifts.logicalRed); - X11DRV_PALETTE_ComputeShifts(visual->green_mask, &X11DRV_PALETTE_default_shifts.physicalGreen, &X11DRV_PALETTE_default_shifts.logicalGreen); - X11DRV_PALETTE_ComputeShifts(visual->blue_mask, &X11DRV_PALETTE_default_shifts.physicalBlue, &X11DRV_PALETTE_default_shifts.logicalBlue); + X11DRV_PALETTE_ComputeColorShifts(&X11DRV_PALETTE_default_shifts, visual->red_mask, visual->green_mask, visual->blue_mask); } XFree(depths); wine_tsx11_unlock(); @@ -281,11 +278,11 @@ void X11DRV_PALETTE_Cleanup(void) } /*********************************************************************** - * X11DRV_PALETTE_ComputeShifts + * X11DRV_PALETTE_ComputeChannelShift * - * Calculate conversion parameters for direct mapped visuals + * Calculate conversion parameters for a given color mask */ -static void X11DRV_PALETTE_ComputeShifts(unsigned long maskbits, ChannelShift *physical, ChannelShift *to_logical) +static void X11DRV_PALETTE_ComputeChannelShift(unsigned long maskbits, ChannelShift *physical, ChannelShift *to_logical) { int i; @@ -327,6 +324,18 @@ static void X11DRV_PALETTE_ComputeShifts(unsigned long maskbits, ChannelShift *p } /*********************************************************************** + * X11DRV_PALETTE_ComputeColorShifts + * + * Calculate conversion parameters for a given color + */ +void X11DRV_PALETTE_ComputeColorShifts(ColorShifts *shifts, unsigned long redMask, unsigned long greenMask, unsigned long blueMask) +{ + X11DRV_PALETTE_ComputeChannelShift(redMask, &shifts->physicalRed, &shifts->logicalRed); + X11DRV_PALETTE_ComputeChannelShift(greenMask, &shifts->physicalGreen, &shifts->logicalGreen); + X11DRV_PALETTE_ComputeChannelShift(blueMask, &shifts->physicalBlue, &shifts->logicalBlue); +} + +/*********************************************************************** * X11DRV_PALETTE_BuildPrivateMap * * Allocate colorcells and initialize mapping tables. diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index eb84089..078b1fd 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -493,6 +493,7 @@ extern BOOL X11DRV_IsSolidColor(COLORREF color); extern COLORREF X11DRV_PALETTE_ToLogical(X11DRV_PDEVICE *physDev, int pixel); extern int X11DRV_PALETTE_ToPhysical(X11DRV_PDEVICE *physDev, COLORREF color); extern int X11DRV_PALETTE_LookupPixel(COLORREF color); +extern void X11DRV_PALETTE_ComputeColorShifts(ColorShifts *shifts, unsigned long redMask, unsigned long greenMask, unsigned long blueMask); extern unsigned int depth_to_bpp( unsigned int depth );

1 0

Roderick Colenbrander : winex11: Use ColorShifts in get_xrender_format_from_pdevice.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: bb457f7ffd3d6957861f96846de0e1115100368e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb457f7ffd3d6957861f96846… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Sep 2 15:00:54 2009 +0200 winex11: Use ColorShifts in get_xrender_format_from_pdevice. --- dlls/winex11.drv/xrender.c | 43 ++++++++++++++++++++++++++++++------------- 1 files changed, 30 insertions(+), 13 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index a5ea946..a0f9b7b 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -429,21 +429,38 @@ static WineXRenderFormat *get_xrender_format(WXRFormat format) static WineXRenderFormat *get_xrender_format_from_pdevice(X11DRV_PDEVICE *physDev) { - WXRFormat format; - - switch(physDev->depth) + if(physDev->depth == 1) + return get_xrender_format(WXR_FORMAT_MONO); + /* physDevs of a depth <=8, don't have color_shifts set and XRender can't handle those except for 1-bit */ + else if(!physDev->color_shifts) + return default_format; + else { - case 1: - format = WXR_FORMAT_MONO; - break; - default: - /* For now fall back to the format of the default visual. - In the future we should check if we are using a DDB/DIB and what exact format we need. - */ - return default_format; - } + int redMask=0, greenMask=0, blueMask=0; + int i; + ColorShifts *shifts = physDev->color_shifts; + + redMask = shifts->physicalRed.max << shifts->physicalRed.shift; + greenMask = shifts->physicalGreen.max << shifts->physicalGreen.shift; + blueMask = shifts->physicalBlue.max << shifts->physicalBlue.shift; + + /* Try to locate a format which matches the specification of the dibsection. */ + for(i = 0; i < (sizeof(wxr_formats_template) / sizeof(wxr_formats_template[0])); i++) + { + if( physDev->depth == wxr_formats_template[i].depth && + redMask == (wxr_formats_template[i].redMask << wxr_formats_template[i].red) && + greenMask == (wxr_formats_template[i].greenMask << wxr_formats_template[i].green) && + blueMask == (wxr_formats_template[i].blueMask << wxr_formats_template[i].blue) ) - return get_xrender_format(format); + { + /* When we reach this stage the format was found in our template table but this doesn't mean that + * the Xserver also supports this format (e.g. its depth might be too low). The call below verifies that. + */ + return get_xrender_format(wxr_formats_template[i].wxr_format); + } + } + } + return NULL; } static BOOL fontcmp(LFANDSIZE *p1, LFANDSIZE *p2)

1 0

Huw Davies : oledb32: Add a stub IDCInfo interface.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: e789b1e5c0d27010c1d7edd05420cd56abd5bb19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e789b1e5c0d27010c1d7edd05… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 9 10:49:35 2009 +0100 oledb32: Add a stub IDCInfo interface. --- dlls/oledb32/convert.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 61 insertions(+), 1 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index ca2040c..06d49b0 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(oledb); typedef struct { const struct IDataConvertVtbl *lpVtbl; + const struct IDCInfoVtbl *lpDCInfoVtbl; LONG ref; } convert; @@ -46,6 +47,11 @@ static inline convert *impl_from_IDataConvert(IDataConvert *iface) return (convert *)((char*)iface - FIELD_OFFSET(convert, lpVtbl)); } +static inline convert *impl_from_IDCInfo(IDCInfo *iface) +{ + return (convert *)((char*)iface - FIELD_OFFSET(convert, lpDCInfoVtbl)); +} + static HRESULT WINAPI convert_QueryInterface(IDataConvert* iface, REFIID riid, void **obj) @@ -60,6 +66,10 @@ static HRESULT WINAPI convert_QueryInterface(IDataConvert* iface, { *obj = iface; } + else if(IsEqualIID(riid, &IID_IDCInfo)) + { + *obj = &This->lpDCInfoVtbl; + } else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); @@ -131,7 +141,6 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, FIXME("(%p)->(%d, %d, %p, %p, %p): stub\n", This, wSrcType, wDstType, pcbSrcLength, pcbDstLength, pSrc); return E_NOTIMPL; - } static const struct IDataConvertVtbl convert_vtbl = @@ -144,6 +153,56 @@ static const struct IDataConvertVtbl convert_vtbl = convert_GetConversionSize }; +static HRESULT WINAPI dcinfo_QueryInterface(IDCInfo* iface, REFIID riid, void **obj) +{ + convert *This = impl_from_IDCInfo(iface); + + return IDataConvert_QueryInterface((IDataConvert *)This, riid, obj); +} + +static ULONG WINAPI dcinfo_AddRef(IDCInfo* iface) +{ + convert *This = impl_from_IDCInfo(iface); + + return IDataConvert_AddRef((IDataConvert *)This); +} + +static ULONG WINAPI dcinfo_Release(IDCInfo* iface) +{ + convert *This = impl_from_IDCInfo(iface); + + return IDataConvert_Release((IDataConvert *)This); +} + +static HRESULT WINAPI dcinfo_GetInfo(IDCInfo *iface, ULONG num, DCINFOTYPE types[], DCINFO **info) +{ + convert *This = impl_from_IDCInfo(iface); + + FIXME("(%p)->(%d, %p, %p): stub\n", This, num, types, info); + + *info = NULL; + + return E_NOTIMPL; +} + +static HRESULT WINAPI dcinfo_SetInfo(IDCInfo* iface, ULONG num, DCINFO info[]) +{ + convert *This = impl_from_IDCInfo(iface); + + FIXME("(%p)->(%d, %p): stub\n", This, num, info); + + return E_NOTIMPL; +} + +static const struct IDCInfoVtbl dcinfo_vtbl = +{ + dcinfo_QueryInterface, + dcinfo_AddRef, + dcinfo_Release, + dcinfo_GetInfo, + dcinfo_SetInfo +}; + HRESULT create_oledb_convert(IUnknown *outer, void **obj) { convert *This; @@ -158,6 +217,7 @@ HRESULT create_oledb_convert(IUnknown *outer, void **obj) if(!This) return E_OUTOFMEMORY; This->lpVtbl = &convert_vtbl; + This->lpDCInfoVtbl = &dcinfo_vtbl; This->ref = 1; *obj = &This->lpVtbl;

1 0