wine-commits January 2009

wine-commits@winehq.org

3 participants
1348 discussions

Francois Gouget : kernel32: Fix some bad left-over uses of value in the CPU detection code.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: 89c63fd32b94a2f762696c9c25a230649e9be3e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89c63fd32b94a2f762696c9c2… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 20 09:13:12 2009 +0100 kernel32: Fix some bad left-over uses of value in the CPU detection code. --- dlls/kernel32/cpu.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 0898117..bc890c6 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -569,7 +569,7 @@ VOID WINAPI GetSystemInfo( #endif #ifdef CPU_SSE2 mib[1] = CPU_SSE2; /* this should imply MMX */ - value[1] = sizeof(value); + val_len = sizeof(value); if (sysctl(mib, 2, &value, &val_len, NULL, 0) >= 0) if (value) PF[PF_MMX_INSTRUCTIONS_AVAILABLE] = TRUE; #endif @@ -578,7 +578,7 @@ VOID WINAPI GetSystemInfo( val_len = sizeof(value); if (sysctl(mib, 2, &value, &val_len, NULL, 0) >= 0) if (value > cachedsi.dwNumberOfProcessors) - cachedsi.dwNumberOfProcessors = value[0]; + cachedsi.dwNumberOfProcessors = value; mib[1] = HW_MODEL; val_len = sizeof(model)-1; if (sysctl(mib, 2, model, &val_len, NULL, 0) >= 0) { @@ -614,16 +614,17 @@ VOID WINAPI GetSystemInfo( if (f != NULL) { while (fgets(model, 255, f) != NULL) { - if (sscanf(model,"cpu%d: features %x<", value, value+1) == 2) { + int cpu, features; + if (sscanf(model,"cpu%d: features %x<", &cpu, &features) == 2) { /* we could scan the string but it is easier to test the bits directly */ - if (value[1] & 0x1) + if (features & 0x1) PF[PF_FLOATING_POINT_EMULATED] = TRUE; - if (value[1] & 0x10) + if (features & 0x10) PF[PF_RDTSC_INSTRUCTION_AVAILABLE] = TRUE; - if (value[1] & 0x100) + if (features & 0x100) PF[PF_COMPARE_EXCHANGE_DOUBLE] = TRUE; - if (value[1] & 0x800000) + if (features & 0x800000) PF[PF_MMX_INSTRUCTIONS_AVAILABLE] = TRUE; break;

1 0

Erich Hoover : oleaut32: Fix OLEPicture rendering vector metafiles without setting up the source rectangle .
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: a82cdfc05016dffb9f8f649e9f00c675afd0e681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a82cdfc05016dffb9f8f649e9… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Jan 19 19:50:03 2009 -0700 oleaut32: Fix OLEPicture rendering vector metafiles without setting up the source rectangle. --- dlls/oleaut32/olepicture.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index c80f357..f05501d 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -710,17 +710,27 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc, case PICTYPE_METAFILE: { - POINT prevOrg; - SIZE prevExt; + POINT prevOrg, prevWndOrg; + SIZE prevExt, prevWndExt; int oldmode; + /* Render the WMF to the appropriate location by setting the + appropriate ratio between "device units" and "logical units" */ oldmode = SetMapMode(hdc, MM_ANISOTROPIC); + /* For the "source rectangle" the y-axis must be inverted */ + SetWindowOrgEx(hdc, xSrc, This->himetricHeight-ySrc, &prevWndOrg); + SetWindowExtEx(hdc, cxSrc, -cySrc, &prevWndExt); + /* For the "destination rectangle" no inversion is necessary */ SetViewportOrgEx(hdc, x, y, &prevOrg); SetViewportExtEx(hdc, cx, cy, &prevExt); if (!PlayMetaFile(hdc, This->desc.u.wmf.hmeta)) ERR("PlayMetaFile failed!\n"); + /* We're done, restore the DC to the previous settings for converting + logical units to device units */ + SetWindowExtEx(hdc, prevWndExt.cx, prevWndExt.cy, NULL); + SetWindowOrgEx(hdc, prevWndOrg.x, prevWndOrg.y, NULL); SetViewportExtEx(hdc, prevExt.cx, prevExt.cy, NULL); SetViewportOrgEx(hdc, prevOrg.x, prevOrg.y, NULL); SetMapMode(hdc, oldmode);

1 0

Mario Kacmar : shlwapi: Added Slovak translation.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: a00ce600205ed788b23fe123474bcb8f1009c8d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a00ce600205ed788b23fe1234… Author: Mario Kacmar <kario(a)szm.sk> Date: Mon Nov 17 00:15:57 2008 +0100 shlwapi: Added Slovak translation. --- dlls/shlwapi/shlwapi.rc | 1 + dlls/shlwapi/shlwapi_Sk.rc | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/shlwapi.rc b/dlls/shlwapi/shlwapi.rc index 2416649..2a205fe 100644 --- a/dlls/shlwapi/shlwapi.rc +++ b/dlls/shlwapi/shlwapi.rc @@ -43,6 +43,7 @@ #include "shlwapi_Ro.rc" #include "shlwapi_Ru.rc" #include "shlwapi_Si.rc" +#include "shlwapi_Sk.rc" #include "shlwapi_Sv.rc" #include "shlwapi_Tr.rc" #include "shlwapi_Zh.rc" diff --git a/dlls/shlwapi/shlwapi_Sk.rc b/dlls/shlwapi/shlwapi_Sk.rc new file mode 100644 index 0000000..e5479e9 --- /dev/null +++ b/dlls/shlwapi/shlwapi_Sk.rc @@ -0,0 +1,43 @@ +/* Slovak translation for shlwapi + * + * Copyright 2004 Jon Griffiths + * Copyright 2008 M�rio Ka�m�r (Mario Kacmar) + * + * 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 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Chyba!" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 + LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 + CHECKBOX "Nabud�ce toto dial�gov� okno nezo&brazova�", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Zru�i�" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"�n&o" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Nie" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ + IDS_BYTES_FORMAT "%ld bajtov" + IDS_TIME_INTERVAL_HOURS " hod." + IDS_TIME_INTERVAL_MINUTES " min." + IDS_TIME_INTERVAL_SECONDS " s" +}

1 0

Mario Kacmar : setupapi: Added Slovak translation.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: ce9323cf89c6ccade6058e39962b69de870dcf6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce9323cf89c6ccade6058e399… Author: Mario Kacmar <kario(a)szm.sk> Date: Mon Nov 17 00:10:31 2008 +0100 setupapi: Added Slovak translation. --- dlls/setupapi/Sk.rc | 34 ++++++++++++++++++++++++++++++++++ dlls/setupapi/setupapi.rc | 1 + 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/Sk.rc b/dlls/setupapi/Sk.rc new file mode 100644 index 0000000..4b08a46 --- /dev/null +++ b/dlls/setupapi/Sk.rc @@ -0,0 +1,34 @@ +/* + * Slovak resources for SETUPAPI + * + * Copyright 2008 M�rio Ka�m�r (Mario Kacmar) + * + * 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 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Kop�rovanie s�borov..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Zru�i�", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Zdroj:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Cie�:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END diff --git a/dlls/setupapi/setupapi.rc b/dlls/setupapi/setupapi.rc index 3bdf7de..4a98758 100644 --- a/dlls/setupapi/setupapi.rc +++ b/dlls/setupapi/setupapi.rc @@ -44,6 +44,7 @@ #include "Ro.rc" #include "Ru.rc" #include "Si.rc" +#include "Sk.rc" #include "Sv.rc" #include "Tr.rc" #include "Zh.rc"

1 0

Mario Kacmar : comctl32: Added Slovak translation.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: 2cf66e9a63f17542b0474a86aaeec67feff16a06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cf66e9a63f17542b0474a86a… Author: Mario Kacmar <kario(a)szm.sk> Date: Mon Nov 17 00:04:09 2008 +0100 comctl32: Added Slovak translation. --- dlls/comctl32/comctl_Sk.rc | 90 ++++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/rsrc.rc | 1 + 2 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/comctl_Sk.rc b/dlls/comctl32/comctl_Sk.rc new file mode 100644 index 0000000..fb5f65d --- /dev/null +++ b/dlls/comctl32/comctl_Sk.rc @@ -0,0 +1,90 @@ +/* + * Copyright 1999 Eric Kohl + * Copyright 2008 M�rio Ka�m�r + * + * 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 + */ + +/* Slovak strings in CP1250 */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "%s - vlastnosti" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "Zru�i�", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Pou�i�", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "Pomocn�k", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Sprievodca" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< &Nasp�", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "�&alej >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "Dokon�i�", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "Zru�i�", IDCANCEL,178,138,50,14 + PUSHBUTTON "Pomocn�k", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Prisp�sobenie panela n�strojov" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Zavrie�", IDCANCEL,308,6,44,14 + PUSHBUTTON "Pr&edvolen�", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Pomocn�k", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "Posun�� na&hor", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "Posun�� na&dol", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "D&ostun� tla�idl�:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "Prid&a� ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- Odob&ra�", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "&Tla�idl� panela:", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "Zavrie�" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "Dnes:" + IDM_GOTODAY "Cho� na dne�ok" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "Odde�ova�" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "�iadne" +} diff --git a/dlls/comctl32/rsrc.rc b/dlls/comctl32/rsrc.rc index c3bf74a..1d1edb5 100644 --- a/dlls/comctl32/rsrc.rc +++ b/dlls/comctl32/rsrc.rc @@ -109,6 +109,7 @@ IDI_TT_ERROR_SM ICON LOADONCALL DISCARDABLE idi_tt_error_sm.ico #include "comctl_Ro.rc" #include "comctl_Ru.rc" #include "comctl_Si.rc" +#include "comctl_Sk.rc" #include "comctl_Sv.rc" #include "comctl_Th.rc" #include "comctl_Tr.rc"

1 0

Mario Kacmar : comdlg32: Update Slovak translation.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: 972741983d3ec02e43575246cd2bae045f61ab2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=972741983d3ec02e43575246c… Author: Mario Kacmar <kario(a)szm.sk> Date: Mon Nov 17 00:23:37 2008 +0100 comdlg32: Update Slovak translation. --- dlls/comdlg32/cdlg_Sk.rc | 143 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 107 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=972741983d3ec02e43575…

1 0

Austin English : widl: Fix a compiler warning.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: e5418e194a6fa846f3e433a8e44e51802e0f80b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5418e194a6fa846f3e433a8e… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jan 19 17:11:36 2009 -0600 widl: Fix a compiler warning. --- tools/widl/widltypes.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index e6b0369..211aab4 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -538,6 +538,7 @@ static inline enum type_type type_get_type_detect_alias(const type_t *type) return TYPE_MODULE; default: assert(0); + return 0; } }

1 0

Mikołaj Zalewski : comctl32: treeview: Add a test showing that a pszText of NULL is equivalent to LPSTR_CALLBACK.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: 390e1dfa282e1735c86f1d01fc17b5d8d5bda287 URL: http://source.winehq.org/git/wine.git/?a=commit;h=390e1dfa282e1735c86f1d01f… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Jan 19 22:29:45 2009 +0100 comctl32: treeview: Add a test showing that a pszText of NULL is equivalent to LPSTR_CALLBACK. --- dlls/comctl32/tests/treeview.c | 70 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 5e2746c..0e85014 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -32,6 +32,8 @@ #include "wine/test.h" #include "msg.h" +const char *TEST_CALLBACK_TEXT = "callback_text"; + #define NUM_MSG_SEQUENCES 1 #define LISTVIEW_SEQ_INDEX 0 @@ -264,6 +266,64 @@ static void FillRoot(void) ok(!strcmp(sequence, "AB."), "Item creation\n"); } +static void TestCallback(void) +{ + HTREEITEM hRoot; + HTREEITEM hItem1, hItem2; + TVINSERTSTRUCTA ins; + TVITEM tvi; + CHAR test_string[] = "Test_string"; + CHAR buf[128]; + LRESULT ret; + + TreeView_DeleteAllItems(hTree); + ins.hParent = TVI_ROOT; + ins.hInsertAfter = TVI_ROOT; + U(ins).item.mask = TVIF_TEXT; + U(ins).item.pszText = LPSTR_TEXTCALLBACK; + hRoot = TreeView_InsertItem(hTree, &ins); + assert(hRoot); + + tvi.hItem = hRoot; + tvi.mask = TVIF_TEXT; + tvi.pszText = buf; + tvi.cchTextMax = sizeof(buf)/sizeof(buf[0]); + ret = TreeView_GetItem(hTree, &tvi); + ok(ret == 1, "ret"); + ok(strcmp(tvi.pszText, TEST_CALLBACK_TEXT) == 0, "Callback item text mismatch %s vs %s\n", + tvi.pszText, TEST_CALLBACK_TEXT); + + ins.hParent = hRoot; + ins.hInsertAfter = TVI_FIRST; + U(ins).item.mask = TVIF_TEXT; + U(ins).item.pszText = test_string; + hItem1 = TreeView_InsertItem(hTree, &ins); + assert(hItem1); + + tvi.hItem = hItem1; + TreeView_GetItem(hTree, &tvi); + ok(strcmp(tvi.pszText, test_string) == 0, "Item text mismatch %s vs %s\n", + tvi.pszText, test_string); + + /* undocumented: pszText of NULL also means LPSTR_CALLBACK: */ + tvi.pszText = NULL; + ret = TreeView_SetItem(hTree, &tvi); + ok(ret == 1, "Expected SetItem return 1, got %ld\n", ret); + tvi.pszText = buf; + TreeView_GetItem(hTree, &tvi); + todo_wine ok(strcmp(tvi.pszText, TEST_CALLBACK_TEXT) == 0, "Item text mismatch %s vs %s\n", + tvi.pszText, TEST_CALLBACK_TEXT); + + U(ins).item.pszText = NULL; + hItem2 = TreeView_InsertItem(hTree, &ins); + assert(hItem2); + tvi.hItem = hItem2; + memset(buf, 0, sizeof(buf)); + TreeView_GetItem(hTree, &tvi); + todo_wine ok(strcmp(tvi.pszText, TEST_CALLBACK_TEXT) == 0, "Item text mismatch %s vs %s\n", + tvi.pszText, TEST_CALLBACK_TEXT); +} + static void DoTest1(void) { BOOL r; @@ -664,6 +724,13 @@ static LRESULT CALLBACK MyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa IdentifyItem(pTreeView->itemOld.hItem); IdentifyItem(pTreeView->itemNew.hItem); return 0; + case TVN_GETDISPINFOA: { + NMTVDISPINFOA *disp = (NMTVDISPINFOA *)lParam; + if (disp->item.mask & TVIF_TEXT) { + lstrcpyn(disp->item.pszText, TEST_CALLBACK_TEXT, disp->item.cchTextMax); + } + return 0; + } } } return 0; @@ -746,6 +813,9 @@ START_TEST(treeview) /* Sequences tested inside due to number */ TestGetSet(); + /* Clears all the previous items */ + TestCallback(); + PostMessageA(hMainWnd, WM_CLOSE, 0, 0); while(GetMessageA(&msg,0,0,0)) { TranslateMessage(&msg);

1 0

Andrew Talbot : rsaenh: Declare some functions static.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: 59a4a5d93518d67e88cafcb0edca09b44f425b58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59a4a5d93518d67e88cafcb0e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Jan 19 21:25:43 2009 +0000 rsaenh: Declare some functions static. --- dlls/rsaenh/mpi.c | 256 ++++++++++++++++++++++++------------------------ dlls/rsaenh/tomcrypt.h | 18 ---- 2 files changed, 128 insertions(+), 146 deletions(-) diff --git a/dlls/rsaenh/mpi.c b/dlls/rsaenh/mpi.c index e4e8ab8..d6d1072 100644 --- a/dlls/rsaenh/mpi.c +++ b/dlls/rsaenh/mpi.c @@ -52,6 +52,53 @@ static int mp_invmod_slow (const mp_int * a, mp_int * b, mp_int * c); static int mp_karatsuba_mul(const mp_int *a, const mp_int *b, mp_int *c); static int mp_karatsuba_sqr(const mp_int *a, mp_int *b); +/* b = a/2 */ +static int mp_div_2(const mp_int * a, mp_int * b) +{ + int x, res, oldused; + + /* copy */ + if (b->alloc < a->used) { + if ((res = mp_grow (b, a->used)) != MP_OKAY) { + return res; + } + } + + oldused = b->used; + b->used = a->used; + { + register mp_digit r, rr, *tmpa, *tmpb; + + /* source alias */ + tmpa = a->dp + b->used - 1; + + /* dest alias */ + tmpb = b->dp + b->used - 1; + + /* carry */ + r = 0; + for (x = b->used - 1; x >= 0; x--) { + /* get the carry for the next iteration */ + rr = *tmpa & 1; + + /* shift the current digit, add in carry and store */ + *tmpb-- = (*tmpa-- >> 1) | (r << (DIGIT_BIT - 1)); + + /* forward carry to next iteration */ + r = rr; + } + + /* zero excess digits */ + tmpb = b->dp + b->used; + for (x = b->used; x < oldused; x++) { + *tmpb++ = 0; + } + } + b->sign = a->sign; + mp_clamp (b); + return MP_OKAY; +} + /* computes the modular inverse via binary extended euclidean algorithm, * that is c = 1/a mod b * @@ -1016,6 +1063,82 @@ mp_count_bits (const mp_int * a) return r; } +/* shift right by a certain bit count (store quotient in c, optional remainder in d) */ +static int mp_div_2d (const mp_int * a, int b, mp_int * c, mp_int * d) +{ + mp_digit D, r, rr; + int x, res; + mp_int t; + + + /* if the shift count is <= 0 then we do no work */ + if (b <= 0) { + res = mp_copy (a, c); + if (d != NULL) { + mp_zero (d); + } + return res; + } + + if ((res = mp_init (&t)) != MP_OKAY) { + return res; + } + + /* get the remainder */ + if (d != NULL) { + if ((res = mp_mod_2d (a, b, &t)) != MP_OKAY) { + mp_clear (&t); + return res; + } + } + + /* copy */ + if ((res = mp_copy (a, c)) != MP_OKAY) { + mp_clear (&t); + return res; + } + + /* shift by as many digits in the bit count */ + if (b >= DIGIT_BIT) { + mp_rshd (c, b / DIGIT_BIT); + } + + /* shift any bit count < DIGIT_BIT */ + D = (mp_digit) (b % DIGIT_BIT); + if (D != 0) { + register mp_digit *tmpc, mask, shift; + + /* mask */ + mask = (((mp_digit)1) << D) - 1; + + /* shift for lsb */ + shift = DIGIT_BIT - D; + + /* alias */ + tmpc = c->dp + (c->used - 1); + + /* carry */ + r = 0; + for (x = c->used - 1; x >= 0; x--) { + /* get the lower bits of this word in a temp */ + rr = *tmpc & mask; + + /* shift the current word and mix in the carry bits from the previous word */ + *tmpc = (*tmpc >> D) | (r << shift); + --tmpc; + + /* set the carry to the carry bits of the current word found above */ + r = rr; + } + } + mp_clamp (c); + if (d != NULL) { + mp_exch (&t, d); + } + mp_clear (&t); + return MP_OKAY; +} + /* integer signed division. * c*b + d == a [e.g. a/b, c=quotient, d=remainder] * HAC pp.598 Algorithm 14.20 @@ -1029,7 +1152,7 @@ mp_count_bits (const mp_int * a) * The overall algorithm is as described as * 14.20 from HAC but fixed to treat these cases. */ -int mp_div (const mp_int * a, const mp_int * b, mp_int * c, mp_int * d) +static int mp_div (const mp_int * a, const mp_int * b, mp_int * c, mp_int * d) { mp_int q, x, y, t1, t2; int res, n, t, i, norm, neg; @@ -1212,129 +1335,6 @@ __Q:mp_clear (&q); return res; } -/* b = a/2 */ -int mp_div_2(const mp_int * a, mp_int * b) -{ - int x, res, oldused; - - /* copy */ - if (b->alloc < a->used) { - if ((res = mp_grow (b, a->used)) != MP_OKAY) { - return res; - } - } - - oldused = b->used; - b->used = a->used; - { - register mp_digit r, rr, *tmpa, *tmpb; - - /* source alias */ - tmpa = a->dp + b->used - 1; - - /* dest alias */ - tmpb = b->dp + b->used - 1; - - /* carry */ - r = 0; - for (x = b->used - 1; x >= 0; x--) { - /* get the carry for the next iteration */ - rr = *tmpa & 1; - - /* shift the current digit, add in carry and store */ - *tmpb-- = (*tmpa-- >> 1) | (r << (DIGIT_BIT - 1)); - - /* forward carry to next iteration */ - r = rr; - } - - /* zero excess digits */ - tmpb = b->dp + b->used; - for (x = b->used; x < oldused; x++) { - *tmpb++ = 0; - } - } - b->sign = a->sign; - mp_clamp (b); - return MP_OKAY; -} - -/* shift right by a certain bit count (store quotient in c, optional remainder in d) */ -int mp_div_2d (const mp_int * a, int b, mp_int * c, mp_int * d) -{ - mp_digit D, r, rr; - int x, res; - mp_int t; - - - /* if the shift count is <= 0 then we do no work */ - if (b <= 0) { - res = mp_copy (a, c); - if (d != NULL) { - mp_zero (d); - } - return res; - } - - if ((res = mp_init (&t)) != MP_OKAY) { - return res; - } - - /* get the remainder */ - if (d != NULL) { - if ((res = mp_mod_2d (a, b, &t)) != MP_OKAY) { - mp_clear (&t); - return res; - } - } - - /* copy */ - if ((res = mp_copy (a, c)) != MP_OKAY) { - mp_clear (&t); - return res; - } - - /* shift by as many digits in the bit count */ - if (b >= DIGIT_BIT) { - mp_rshd (c, b / DIGIT_BIT); - } - - /* shift any bit count < DIGIT_BIT */ - D = (mp_digit) (b % DIGIT_BIT); - if (D != 0) { - register mp_digit *tmpc, mask, shift; - - /* mask */ - mask = (((mp_digit)1) << D) - 1; - - /* shift for lsb */ - shift = DIGIT_BIT - D; - - /* alias */ - tmpc = c->dp + (c->used - 1); - - /* carry */ - r = 0; - for (x = c->used - 1; x >= 0; x--) { - /* get the lower bits of this word in a temp */ - rr = *tmpc & mask; - - /* shift the current word and mix in the carry bits from the previous word */ - *tmpc = (*tmpc >> D) | (r << shift); - --tmpc; - - /* set the carry to the carry bits of the current word found above */ - r = rr; - } - } - mp_clamp (c); - if (d != NULL) { - mp_exch (&t, d); - } - mp_clear (&t); - return MP_OKAY; -} - static int s_is_power_of_two(mp_digit b, int *p) { int x; @@ -1349,7 +1349,7 @@ static int s_is_power_of_two(mp_digit b, int *p) } /* single digit division (based on routine from MPI) */ -int mp_div_d (const mp_int * a, mp_digit b, mp_int * c, mp_digit * d) +static int mp_div_d (const mp_int * a, mp_digit b, mp_int * c, mp_digit * d) { mp_int q; mp_word w; @@ -1430,7 +1430,7 @@ int mp_div_d (const mp_int * a, mp_digit b, mp_int * c, mp_digit * d) * * Input x must be in the range 0 <= x <= (n-1)**2 */ -int +static int mp_dr_reduce (mp_int * x, const mp_int * n, mp_digit k) { int err, i, m; @@ -1489,8 +1489,8 @@ top: return MP_OKAY; } -/* determines the setup value */ -void mp_dr_setup(const mp_int *a, mp_digit *d) +/* sets the value of "d" required for mp_dr_reduce */ +static void mp_dr_setup(const mp_int *a, mp_digit *d) { /* the casts are required if DIGIT_BIT is one less than * the number of bits in a mp_digit [e.g. DIGIT_BIT==31] diff --git a/dlls/rsaenh/tomcrypt.h b/dlls/rsaenh/tomcrypt.h index 4348620..4ec2dc2 100644 --- a/dlls/rsaenh/tomcrypt.h +++ b/dlls/rsaenh/tomcrypt.h @@ -300,12 +300,6 @@ void mp_rshd(mp_int *a, int b); /* left shift by "b" digits */ int mp_lshd(mp_int *a, int b); -/* c = a / 2**b */ -int mp_div_2d(const mp_int *a, int b, mp_int *c, mp_int *d); - -/* b = a/2 */ -int mp_div_2(const mp_int *a, mp_int *b); - /* c = a * 2**b */ int mp_mul_2d(const mp_int *a, int b, mp_int *c); @@ -362,9 +356,6 @@ int mp_mul(const mp_int *a, const mp_int *b, mp_int *c); /* b = a*a */ int mp_sqr(const mp_int *a, mp_int *b); -/* a/b => cb + d == a */ -int mp_div(const mp_int *a, const mp_int *b, mp_int *c, mp_int *d); - /* c = a mod b, 0 <= c < b */ int mp_mod(const mp_int *a, mp_int *b, mp_int *c); @@ -382,9 +373,6 @@ int mp_sub_d(mp_int *a, mp_digit b, mp_int *c); /* c = a * b */ int mp_mul_d(const mp_int *a, mp_digit b, mp_int *c); -/* a/b => cb + d == a */ -int mp_div_d(const mp_int *a, mp_digit b, mp_int *c, mp_digit *d); - /* a/3 => 3c + d == a */ int mp_div_3(mp_int *a, mp_int *c, mp_digit *d); @@ -459,12 +447,6 @@ int mp_montgomery_reduce(mp_int *a, const mp_int *m, mp_digit mp); /* returns 1 if a is a valid DR modulus */ int mp_dr_is_modulus(mp_int *a); -/* sets the value of "d" required for mp_dr_reduce */ -void mp_dr_setup(const mp_int *a, mp_digit *d); - -/* reduces a modulo b using the Diminished Radix method */ -int mp_dr_reduce(mp_int *a, const mp_int *b, mp_digit mp); - /* returns true if a can be reduced with mp_reduce_2k */ int mp_reduce_is_2k(mp_int *a);

1 0

Aric Stewart : imm: Send WM_IME_SELECT messages when IME is selected and deselected.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: e9b320936960323f98114dd7a0086bed1f9f464e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9b320936960323f98114dd7a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 19 14:28:53 2009 -0600 imm: Send WM_IME_SELECT messages when IME is selected and deselected. --- dlls/imm32/imm.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 2299f20..14178c3 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -656,6 +656,7 @@ HIMC WINAPI ImmCreateContext(void) IMM_DestroyContext(new_context); return 0; } + SendMessageW(GetFocus(), WM_IME_SELECT, TRUE, (LPARAM)GetKeyboardLayout(0)); new_context->immKbd->uSelected++; TRACE("Created context %p\n",new_context); @@ -673,6 +674,7 @@ static BOOL IMM_DestroyContext(HIMC hIMC) { data->immKbd->uSelected --; data->immKbd->pImeSelect(hIMC, FALSE); + SendMessageW(data->IMC.hWnd, WM_IME_SELECT, FALSE, (LPARAM)GetKeyboardLayout(0)); if (IMM_GetThreadData()->hwndDefault == data->imeWnd) IMM_GetThreadData()->hwndDefault = NULL;

1 0

Jump to page:

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 January 2009