July 2010 - Wine-Commits - list.winehq.org

Igor Paliychuk : jscript: Add Ukrainian translation.
by Alexandre Julliard July 21, 2010

July 21, 2010

Module: wine Branch: master Commit: a57e06aac8c2ac725fe8b5281257fab9ca40d473 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a57e06aac8c2ac725fe8b5281… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Tue Jul 20 21:04:17 2010 +0300 jscript: Add Ukrainian translation. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/jscript_Uk.rc | 51 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index ce015e1..81c4071 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -23,6 +23,7 @@ RC_SRCS = \ jscript_Ro.rc \ jscript_Ru.rc \ jscript_Si.rc \ + jscript_Uk.rc \ rsrc.rc C_SRCS = \ diff --git a/dlls/jscript/jscript_Uk.rc b/dlls/jscript/jscript_Uk.rc new file mode 100644 index 0000000..9b68ec9 --- /dev/null +++ b/dlls/jscript/jscript_Uk.rc @@ -0,0 +1,51 @@ +/* + * Copyright 2009 Piotr Caban + * Copyright 2010 Igor Paliychuk + * + * 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_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TO_PRIMITIVE "Помилка конвертування об'єкту в примітивний тип" + IDS_INVALID_CALL_ARG "Невірний виклик процедури або аргумент" + IDS_CREATE_OBJ_ERROR "Сервер автоматизації не може створити об'єкт" + 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_OBJECT_EXPECTED "Очікується об'єкт" + IDS_ILLEGAL_ASSIGN "Невірне присвоєння" + IDS_UNDEFINED "'|' не визначено" + IDS_NOT_BOOL "Очікується об'єкт Boolean" + IDS_JSCRIPT_EXPECTED "Очікується об'єкт JScript" + IDS_REGEXP_SYNTAX_ERROR "Синтаксична помилка в регулярному виразі" + IDS_URI_INVALID_CHAR "URI, що буде закодований, містить неприпустимі символи" + IDS_INVALID_LENGTH "Довжиною масиву повинне бути скінченне додатнє ціле число" + IDS_ARRAY_EXPECTED "Очікується об'єкт Array" +}

1 0

Igor Paliychuk : gphoto2.ds: Add Ukrainian translation.
by Alexandre Julliard July 21, 2010

July 21, 2010

Module: wine Branch: master Commit: 5440dfb8dc5a0042842189d8dbcd0b2ccb9a6922 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5440dfb8dc5a0042842189d8d… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Tue Jul 20 21:01:55 2010 +0300 gphoto2.ds: Add Ukrainian translation. --- dlls/gphoto2.ds/Makefile.in | 1 + dlls/gphoto2.ds/gphoto2_Uk.rc | 60 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/gphoto2.ds/Makefile.in b/dlls/gphoto2.ds/Makefile.in index b588b61..4d18316 100644 --- a/dlls/gphoto2.ds/Makefile.in +++ b/dlls/gphoto2.ds/Makefile.in @@ -32,6 +32,7 @@ RC_SRCS = \ gphoto2_Ru.rc \ gphoto2_Si.rc \ gphoto2_Sv.rc \ + gphoto2_Uk.rc \ gphoto2_Zh.rc @MAKE_DLL_RULES@ diff --git a/dlls/gphoto2.ds/gphoto2_Uk.rc b/dlls/gphoto2.ds/gphoto2_Uk.rc new file mode 100644 index 0000000..1ee6218 --- /dev/null +++ b/dlls/gphoto2.ds/gphoto2_Uk.rc @@ -0,0 +1,60 @@ +/* + * Ukrainian resources for Twain + * + * Copyright 2006 CodeWeavers, Aric Stewart + * Copyright 2010 Igor Paliychuk + * + * 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_UKRAINIAN, SUBLANG_DEFAULT + +IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 +STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU +CAPTION "Файли в камері" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | +WS_TABSTOP,7,7,358,229 + DEFPUSHBUTTON "Імпортувати обране",IDC_IMPORT,152,252,72,14 + PUSHBUTTON "Перегляд",IDC_FETCH,7,252,64,14 + PUSHBUTTON "Імпортувати все",IDC_IMPORTALL,80,252,64,14 + CONTROL "Пропустити діалог",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14 + PUSHBUTTON "Вихід",IDC_EXIT,315,252,50,14 +END + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "Перенесення" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Перенесення... Зачекайте",IDC_STATIC,5,19,176,8, SS_CENTER +END + +IDD_CONNECTING DIALOG DISCARDABLE 0, 0, 280, 116 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER +CAPTION "Під'єднання до камери" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 + LTEXT "Під'єднання до камери... Зачекайте",IDC_STATIC,128,58, + 116,8 +END

1 0

Igor Paliychuk : sane.ds: Add Ukrainian translation.
by Alexandre Julliard July 21, 2010

July 21, 2010

Module: wine Branch: master Commit: 04af975d91cd3905168fe84b705da1615cf44f4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=04af975d91cd3905168fe84b7… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Tue Jul 20 21:06:44 2010 +0300 sane.ds: Add Ukrainian translation. --- dlls/sane.ds/Makefile.in | 1 + dlls/sane.ds/sane_Uk.rc | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/Makefile.in b/dlls/sane.ds/Makefile.in index 2ed1a59..8872a8b 100644 --- a/dlls/sane.ds/Makefile.in +++ b/dlls/sane.ds/Makefile.in @@ -34,6 +34,7 @@ RC_SRCS = \ sane_Ru.rc \ sane_Si.rc \ sane_Sv.rc \ + sane_Uk.rc \ sane_Zh.rc @MAKE_DLL_RULES@ diff --git a/dlls/sane.ds/sane_Uk.rc b/dlls/sane.ds/sane_Uk.rc new file mode 100644 index 0000000..97a17e8 --- /dev/null +++ b/dlls/sane.ds/sane_Uk.rc @@ -0,0 +1,46 @@ +/* + * Ukrainian resources for Twain + * + * Copyright 2006 CodeWeavers, Aric Stewart + * Copyright 2010 Igor Paliychuk + * + * 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_UKRAINIAN, SUBLANG_DEFAULT + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "Сканування" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "СКАНУВАННЯ... Зачекайте",IDC_STATIC,5,19,176,8, SS_CENTER +END + +STRINGTABLE DISCARDABLE +{ + 0 "" + 1 "px" + 2 "b" + 3 "мм" + 4 "точок на дюйм" + 5 "%" + 6 "ns" +}

1 0

Igor Paliychuk : notepad: Ukrainian translation fix.
by Alexandre Julliard July 21, 2010

July 21, 2010

Module: wine Branch: master Commit: 516e8a3b601070e67d77f986af6baf8a3837677c URL: http://source.winehq.org/git/wine.git/?a=commit;h=516e8a3b601070e67d77f986a… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Tue Jul 20 20:45:29 2010 +0300 notepad: Ukrainian translation fix. --- programs/notepad/Uk.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/notepad/Uk.rc b/programs/notepad/Uk.rc index 95938e9..b0844e0 100644 --- a/programs/notepad/Uk.rc +++ b/programs/notepad/Uk.rc @@ -63,7 +63,7 @@ POPUP "&Пошук" { } POPUP "&Довідка" { MENUITEM "&Зміст", CMD_HELP_CONTENTS - MENUITEM "&Пошук...", CMD_HELP_SEARCH + MENUITEM "По&шук...", CMD_HELP_SEARCH MENUITEM "&Використання Довідки", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&Про Notepad", CMD_HELP_ABOUT_NOTEPAD

1 0

Igor Paliychuk : progman: Ukrainian translation fix.
by Alexandre Julliard July 21, 2010

July 21, 2010

Module: wine Branch: master Commit: ffe0ac817cb42fdc7d39c2d135e5620c7c9d71ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffe0ac817cb42fdc7d39c2d13… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Tue Jul 20 20:45:02 2010 +0300 progman: Ukrainian translation fix. --- programs/progman/Uk.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/progman/Uk.rc b/programs/progman/Uk.rc index 3f38f18..22b8315 100644 --- a/programs/progman/Uk.rc +++ b/programs/progman/Uk.rc @@ -33,7 +33,7 @@ MAIN_MENU MENU { POPUP "&Файл" { MENUITEM "&Створити...", PM_NEW - MENUITEM "&Відкрити\tEnter", PM_OPEN + MENUITEM "Відк&рити\tEnter", PM_OPEN MENUITEM "&Перемістити...\tF7", PM_MOVE, GRAYED MENUITEM "&Копіювати...\tF8", PM_COPY, GRAYED MENUITEM "Ви&далити\tEntf", PM_DELETE @@ -56,10 +56,10 @@ MAIN_MENU MENU POPUP "&Допомога" { MENUITEM "&Зміст", PM_CONTENTS - MENUITEM "&Пошук...", PM_SEARCH + MENUITEM "По&шук...", PM_SEARCH MENUITEM SEPARATOR MENUITEM "&Використання Довідки", PM_HELPONHELP - MENUITEM "&Посібник", PM_TUTORIAL + MENUITEM "По&сібник", PM_TUTORIAL MENUITEM SEPARATOR MENUITEM "&Про Wine", PM_ABOUT_WINE }

1 0

Rico Schüller : d3d10: Add data and size check to parse_dxbc().
by Alexandre Julliard July 21, 2010

July 21, 2010

Module: wine Branch: master Commit: 51c2542631688c0de24cdcf44e7da9963b7cfb2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=51c2542631688c0de24cdcf44… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 19 21:48:41 2010 +0200 d3d10: Add data and size check to parse_dxbc(). --- dlls/d3d10/utils.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c index 633d411..a3f761e 100644 --- a/dlls/d3d10/utils.c +++ b/dlls/d3d10/utils.c @@ -141,6 +141,12 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, unsigned int i; DWORD tag; + if (!data) + { + WARN("No data supplied.\n"); + return E_FAIL; + } + read_dword(&ptr, &tag); TRACE("tag: %s.\n", debugstr_an((const char *)&tag, 4)); @@ -158,6 +164,12 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, read_dword(&ptr, &total_size); TRACE("total size: %#x\n", total_size); + if (data_size != total_size) + { + WARN("Wrong size supplied.\n"); + return E_FAIL; + } + read_dword(&ptr, &chunk_count); TRACE("chunk count: %#x\n", chunk_count);

1 0

Marcus Meissner : gdi32: Rebuild font hash after changing the matrix.
by Alexandre Julliard July 21, 2010

July 21, 2010

Module: wine Branch: master Commit: 2f7ec73adde1a87f788eebcf66ec8dd16bf9109f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f7ec73adde1a87f788eebcf6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jul 20 00:17:10 2010 +0200 gdi32: Rebuild font hash after changing the matrix. --- dlls/gdi32/freetype.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ddb3d24..9d88211 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3780,12 +3780,23 @@ found: if(!face->scalable) { /* Windows uses integer scaling factors for bitmap fonts */ INT scale, scaled_height; + GdiFont *cachedfont; /* FIXME: rotation of bitmap fonts is ignored */ height = abs(GDI_ROUND( (double)height * ret->font_desc.matrix.eM22 )); if (ret->aveWidth) ret->aveWidth = (double)ret->aveWidth * ret->font_desc.matrix.eM11; ret->font_desc.matrix.eM11 = ret->font_desc.matrix.eM22 = 1.0; + dcmat.eM11 = dcmat.eM22 = 1.0; + /* As we changed the matrix, we need to search the cache for the font again, + * otherwise we might explode the cache. */ + if((cachedfont = find_in_cache(hfont, &lf, &dcmat, can_use_bitmap)) != NULL) { + TRACE("Found cached font after non-scalable matrix rescale!\n"); + free_font( ret ); + LeaveCriticalSection( &freetype_cs ); + return cachedfont; + } + calc_hash(&ret->font_desc); if (height != 0) height = diff; height += face->size.height;

1 0

Rico Schüller : d3d10: Move some helper funcs to utils .
by Alexandre Julliard July 21, 2010

July 21, 2010

Module: wine Branch: master Commit: 53ea5de66627f88f168c02a55f25025f0e2c4ed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53ea5de66627f88f168c02a55… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 19 21:48:36 2010 +0200 d3d10: Move some helper funcs to utils. --- dlls/d3d10/d3d10_private.h | 27 +++++++++++++ dlls/d3d10/effect.c | 90 -------------------------------------------- dlls/d3d10/utils.c | 70 ++++++++++++++++++++++++++++++++++ 3 files changed, 97 insertions(+), 90 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 2cdd329..2e31f29 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -218,4 +218,31 @@ HRESULT d3d10_effect_parse(struct d3d10_effect *This, const void *data, SIZE_T d HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, UINT flags, void *unknown0, ID3D10Device **device); +#define MAKE_TAG(ch0, ch1, ch2, ch3) \ + ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ + ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) +#define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') +#define TAG_FX10 MAKE_TAG('F', 'X', '1', '0') +#define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') +#define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') +#define TAG_SHDR MAKE_TAG('S', 'H', 'D', 'R') + +HRESULT parse_dxbc(const char *data, SIZE_T data_size, + HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) DECLSPEC_HIDDEN; + +static inline void read_dword(const char **ptr, DWORD *d) +{ + memcpy(d, *ptr, sizeof(*d)); + *ptr += sizeof(*d); +} + +static inline void write_dword(char **ptr, DWORD d) +{ + memcpy(*ptr, &d, sizeof(d)); + *ptr += sizeof(d); +} + +void skip_dword_unknown(const char **ptr, unsigned int count) DECLSPEC_HIDDEN; +void write_dword_unknown(char **ptr, DWORD d) DECLSPEC_HIDDEN; + #endif /* __WINE_D3D10_PRIVATE_H */ diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 43b94f3..af7f811 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -25,14 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); -#define MAKE_TAG(ch0, ch1, ch2, ch3) \ - ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ - ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) -#define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') -#define TAG_FX10 MAKE_TAG('F', 'X', '1', '0') -#define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') -#define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') - #define D3D10_FX10_TYPE_COLUMN_SHIFT 11 #define D3D10_FX10_TYPE_COLUMN_MASK (0x7 << D3D10_FX10_TYPE_COLUMN_SHIFT) @@ -118,88 +110,6 @@ static struct d3d10_effect_variable anonymous_gs = {(const ID3D10EffectVariableV static struct d3d10_effect_type *get_fx10_type(struct d3d10_effect *effect, const char *data, DWORD offset); -static inline void read_dword(const char **ptr, DWORD *d) -{ - memcpy(d, *ptr, sizeof(*d)); - *ptr += sizeof(*d); -} - -static inline void skip_dword_unknown(const char **ptr, unsigned int count) -{ - unsigned int i; - DWORD d; - - FIXME("Skipping %u unknown DWORDs:\n", count); - for (i = 0; i < count; ++i) - { - read_dword(ptr, &d); - FIXME("\t0x%08x\n", d); - } -} - -static inline void write_dword(char **ptr, DWORD d) -{ - memcpy(*ptr, &d, sizeof(d)); - *ptr += sizeof(d); -} - -static inline void write_dword_unknown(char **ptr, DWORD d) -{ - FIXME("Writing unknown DWORD 0x%08x\n", d); - write_dword(ptr, d); -} - -static HRESULT parse_dxbc(const char *data, SIZE_T data_size, - HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) -{ - const char *ptr = data; - HRESULT hr = S_OK; - DWORD chunk_count; - DWORD total_size; - unsigned int i; - DWORD tag; - - read_dword(&ptr, &tag); - TRACE("tag: %s.\n", debugstr_an((const char *)&tag, 4)); - - if (tag != TAG_DXBC) - { - WARN("Wrong tag.\n"); - return E_FAIL; - } - - /* checksum? */ - skip_dword_unknown(&ptr, 4); - - skip_dword_unknown(&ptr, 1); - - read_dword(&ptr, &total_size); - TRACE("total size: %#x\n", total_size); - - read_dword(&ptr, &chunk_count); - TRACE("chunk count: %#x\n", chunk_count); - - for (i = 0; i < chunk_count; ++i) - { - DWORD chunk_tag, chunk_size; - const char *chunk_ptr; - DWORD chunk_offset; - - read_dword(&ptr, &chunk_offset); - TRACE("chunk %u at offset %#x\n", i, chunk_offset); - - chunk_ptr = data + chunk_offset; - - read_dword(&chunk_ptr, &chunk_tag); - read_dword(&chunk_ptr, &chunk_size); - - hr = chunk_handler(chunk_ptr, chunk_size, chunk_tag, ctx); - if (FAILED(hr)) break; - } - - return hr; -} - static BOOL copy_name(const char *ptr, char **name) { size_t name_len; diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c index c5419d3..633d411 100644 --- a/dlls/d3d10/utils.c +++ b/dlls/d3d10/utils.c @@ -111,3 +111,73 @@ void d3d10_rb_free(void *ptr) { HeapFree(GetProcessHeap(), 0, ptr); } + +void skip_dword_unknown(const char **ptr, unsigned int count) +{ + unsigned int i; + DWORD d; + + FIXME("Skipping %u unknown DWORDs:\n", count); + for (i = 0; i < count; ++i) + { + read_dword(ptr, &d); + FIXME("\t0x%08x\n", d); + } +} + +void write_dword_unknown(char **ptr, DWORD d) +{ + FIXME("Writing unknown DWORD 0x%08x\n", d); + write_dword(ptr, d); +} + +HRESULT parse_dxbc(const char *data, SIZE_T data_size, + HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) +{ + const char *ptr = data; + HRESULT hr = S_OK; + DWORD chunk_count; + DWORD total_size; + unsigned int i; + DWORD tag; + + read_dword(&ptr, &tag); + TRACE("tag: %s.\n", debugstr_an((const char *)&tag, 4)); + + if (tag != TAG_DXBC) + { + WARN("Wrong tag.\n"); + return E_FAIL; + } + + /* checksum? */ + skip_dword_unknown(&ptr, 4); + + skip_dword_unknown(&ptr, 1); + + read_dword(&ptr, &total_size); + TRACE("total size: %#x\n", total_size); + + read_dword(&ptr, &chunk_count); + TRACE("chunk count: %#x\n", chunk_count); + + for (i = 0; i < chunk_count; ++i) + { + DWORD chunk_tag, chunk_size; + const char *chunk_ptr; + DWORD chunk_offset; + + read_dword(&ptr, &chunk_offset); + TRACE("chunk %u at offset %#x\n", i, chunk_offset); + + chunk_ptr = data + chunk_offset; + + read_dword(&chunk_ptr, &chunk_tag); + read_dword(&chunk_ptr, &chunk_size); + + hr = chunk_handler(chunk_ptr, chunk_size, chunk_tag, ctx); + if (FAILED(hr)) break; + } + + return hr; +}

1 0

Peter Urbanec : wintab32: Avoid NULL pointer dereferences.
by Alexandre Julliard July 21, 2010

July 21, 2010

Module: wine Branch: master Commit: 5b22afd3c3348a04c08fb380cd71036d90b6719c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b22afd3c3348a04c08fb380c… Author: Peter Urbanec <winehq.org(a)urbanec.net> Date: Tue Jul 20 23:20:07 2010 +1000 wintab32: Avoid NULL pointer dereferences. --- dlls/wintab32/context.c | 50 ++++++++++++++++++++++++++++++++++++++++----- dlls/wintab32/wintab32.c | 28 +++++++++++++++---------- 2 files changed, 61 insertions(+), 17 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 6b52c08..30f0021 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -155,7 +155,8 @@ static void LoadTablet(void) { TRACE("Initializing the tablet to hwnd %p\n",hwndDefault); gLoaded= TRUE; - pLoadTabletInfo(hwndDefault); + if (pLoadTabletInfo) + pLoadTabletInfo(hwndDefault); } int TABLET_PostTabletMessage(LPOPENCONTEXT newcontext, UINT msg, WPARAM wParam, @@ -558,6 +559,11 @@ int WINAPI WTPacketsGet(HCTX hCtx, int cMaxPkts, LPVOID lpPkts) EnterCriticalSection(&csTablet); context = TABLET_FindOpenContext(hCtx); + if (!context) + { + LeaveCriticalSection(&csTablet); + return 0; + } if (lpPkts != NULL) TABLET_BlankPacketData(context,lpPkts,cMaxPkts); @@ -608,6 +614,11 @@ BOOL WINAPI WTPacket(HCTX hCtx, UINT wSerial, LPVOID lpPkt) EnterCriticalSection(&csTablet); context = TABLET_FindOpenContext(hCtx); + if (!context) + { + LeaveCriticalSection(&csTablet); + return 0; + } rc = TABLET_FindPacket(context ,wSerial, &wtp); @@ -642,6 +653,12 @@ BOOL WINAPI WTEnable(HCTX hCtx, BOOL fEnable) EnterCriticalSection(&csTablet); context = TABLET_FindOpenContext(hCtx); + if (!context) + { + LeaveCriticalSection(&csTablet); + return 0; + } + /* if we want to enable and it is not enabled then */ if(fEnable && !context->enabled) { @@ -742,6 +759,12 @@ BOOL WINAPI WTGetA(HCTX hCtx, LPLOGCONTEXTA lpLogCtx) EnterCriticalSection(&csTablet); context = TABLET_FindOpenContext(hCtx); + if (!context) + { + LeaveCriticalSection(&csTablet); + return 0; + } + LOGCONTEXTWtoA(&context->context, lpLogCtx); LeaveCriticalSection(&csTablet); @@ -761,6 +784,12 @@ BOOL WINAPI WTGetW(HCTX hCtx, LPLOGCONTEXTW lpLogCtx) EnterCriticalSection(&csTablet); context = TABLET_FindOpenContext(hCtx); + if (!context) + { + LeaveCriticalSection(&csTablet); + return 0; + } + memmove(lpLogCtx,&context->context,sizeof(LOGCONTEXTW)); LeaveCriticalSection(&csTablet); @@ -888,7 +917,7 @@ int WINAPI WTPacketsPeek(HCTX hCtx, int cMaxPkts, LPVOID lpPkts) context = TABLET_FindOpenContext(hCtx); - if (context->PacketsQueued == 0) + if (!context || context->PacketsQueued == 0) { LeaveCriticalSection(&csTablet); return 0; @@ -923,7 +952,7 @@ int WINAPI WTDataGet(HCTX hCtx, UINT wBegin, UINT wEnd, context = TABLET_FindOpenContext(hCtx); - if (context->PacketsQueued == 0) + if (!context || context->PacketsQueued == 0) { LeaveCriticalSection(&csTablet); return 0; @@ -981,7 +1010,7 @@ int WINAPI WTDataPeek(HCTX hCtx, UINT wBegin, UINT wEnd, context = TABLET_FindOpenContext(hCtx); - if (context->PacketsQueued == 0) + if (!context || context->PacketsQueued == 0) { LeaveCriticalSection(&csTablet); return 0; @@ -1028,7 +1057,7 @@ BOOL WINAPI WTQueuePacketsEx(HCTX hCtx, UINT *lpOld, UINT *lpNew) context = TABLET_FindOpenContext(hCtx); - if (context->PacketsQueued) + if (context && context->PacketsQueued) { *lpOld = context->PacketQueue[0].pkSerialNumber; *lpNew = context->PacketQueue[context->PacketsQueued-1].pkSerialNumber; @@ -1050,14 +1079,18 @@ BOOL WINAPI WTQueuePacketsEx(HCTX hCtx, UINT *lpOld, UINT *lpNew) int WINAPI WTQueueSizeGet(HCTX hCtx) { LPOPENCONTEXT context; + int queueSize = 0; + TRACE("(%p)\n", hCtx); if (!hCtx) return 0; EnterCriticalSection(&csTablet); context = TABLET_FindOpenContext(hCtx); + if (context) + queueSize = context->QueueSize; LeaveCriticalSection(&csTablet); - return context->QueueSize; + return queueSize; } /*********************************************************************** @@ -1074,6 +1107,11 @@ BOOL WINAPI WTQueueSizeSet(HCTX hCtx, int nPkts) EnterCriticalSection(&csTablet); context = TABLET_FindOpenContext(hCtx); + if (!context) + { + LeaveCriticalSection(&csTablet); + return 0; + } context->PacketQueue = HeapReAlloc(GetProcessHeap(), 0, context->PacketQueue, sizeof(WTPACKET)*nPkts); diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index b52b429..53c7523 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -124,23 +124,29 @@ static LRESULT WINAPI TABLET_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, { WTPACKET packet; LPOPENCONTEXT handler; - pGetCurrentPacket(&packet); - handler = AddPacketToContextQueue(&packet,(HWND)lParam); - if (handler && handler->context.lcOptions & CXO_MESSAGES) - TABLET_PostTabletMessage(handler, _WT_PACKET(handler->context.lcMsgBase), - (WPARAM)packet.pkSerialNumber, - (LPARAM)handler->handle, FALSE); + if (pGetCurrentPacket) + { + pGetCurrentPacket(&packet); + handler = AddPacketToContextQueue(&packet,(HWND)lParam); + if (handler && handler->context.lcOptions & CXO_MESSAGES) + TABLET_PostTabletMessage(handler, _WT_PACKET(handler->context.lcMsgBase), + (WPARAM)packet.pkSerialNumber, + (LPARAM)handler->handle, FALSE); + } break; } case WT_PROXIMITY: { WTPACKET packet; LPOPENCONTEXT handler; - pGetCurrentPacket(&packet); - handler = AddPacketToContextQueue(&packet,(HWND)wParam); - if (handler) - TABLET_PostTabletMessage(handler, WT_PROXIMITY, - (WPARAM)handler->handle, lParam, TRUE); + if (pGetCurrentPacket) + { + pGetCurrentPacket(&packet); + handler = AddPacketToContextQueue(&packet,(HWND)wParam); + if (handler) + TABLET_PostTabletMessage(handler, WT_PROXIMITY, + (WPARAM)handler->handle, lParam, TRUE); + } break; } }

1 0

André Hentschel : shell32: Add stub for SHGetPropertyStoreFromParsingName.
by Alexandre Julliard July 21, 2010

July 21, 2010

Module: wine Branch: master Commit: bb2600b68767fc59d4cd4b6a895fb5f57e819dd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb2600b68767fc59d4cd4b6a8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 20 19:40:40 2010 +0200 shell32: Add stub for SHGetPropertyStoreFromParsingName. --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shell32_main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 7f1c5b6..09743e8 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -364,6 +364,7 @@ @ stdcall SHGetPathFromIDList(ptr ptr) SHGetPathFromIDListA @ stdcall SHGetPathFromIDListA(ptr ptr) @ stdcall SHGetPathFromIDListW(ptr ptr) +@ stdcall SHGetPropertyStoreFromParsingName(wstr ptr long ptr ptr) @ stdcall SHGetSettings(ptr long) @ stdcall SHGetSpecialFolderLocation(long long ptr) @ stdcall SHGetSpecialFolderPathA(long ptr long long) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 75b9c7e..f906a24 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -38,6 +38,7 @@ #include "wingdi.h" #include "shlobj.h" #include "shlwapi.h" +#include "propsys.h" #include "undocshell.h" #include "pidl.h" @@ -854,6 +855,15 @@ VOID WINAPI Printers_UnregisterWindow(HANDLE hClassPidl, HWND hwnd) FIXME("(%p, %p) stub!\n", hClassPidl, hwnd); } +/************************************************************************* + * SHGetPropertyStoreFromParsingName [SHELL32.@] + */ +HRESULT SHGetPropertyStoreFromParsingName(PCWSTR pszPath, IBindCtx *pbc, GETPROPERTYSTOREFLAGS flags, REFIID riid, void **ppv) +{ + FIXME("(%s %p %u %p %p) stub!\n", debugstr_w(pszPath), pbc, flags, riid, ppv); + return E_NOTIMPL; +} + /*************************************************************************/ typedef struct

1 0