January 2009 - Wine-Commits

Francois Gouget : wineconsole: WCUSER_OptionDlgProc(): use the given configuration information.
by Alexandre Julliard Jan. 20, 2009

Jan. 20, 2009

Module: wine Branch: master Commit: cf92ee98be2128e5ebe0ee11ae3643ec1ee6a409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf92ee98be2128e5ebe0ee11a… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 20 09:15:15 2009 +0100 wineconsole: WCUSER_OptionDlgProc(): use the given configuration information. --- programs/wineconsole/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineconsole/dialog.c b/programs/wineconsole/dialog.c index 5c27017..cde013f 100644 --- a/programs/wineconsole/dialog.c +++ b/programs/wineconsole/dialog.c @@ -73,7 +73,7 @@ static INT_PTR WINAPI WCUSER_OptionDlgProc(HWND hDlg, UINT msg, WPARAM wParam, L else if (di->config.cursor_size <= 50) idc = IDC_OPT_CURSOR_MEDIUM; else idc = IDC_OPT_CURSOR_LARGE; SendDlgItemMessage(hDlg, idc, BM_SETCHECK, BST_CHECKED, 0L); - SetDlgItemInt(hDlg, IDC_OPT_HIST_SIZE, WINECON_GetHistorySize(di->data->hConIn), FALSE); + SetDlgItemInt(hDlg, IDC_OPT_HIST_SIZE, di->config.history_size, FALSE); SendDlgItemMessage(hDlg, IDC_OPT_HIST_NODOUBLE, BM_SETCHECK, (di->config.history_nodup) ? BST_CHECKED : BST_UNCHECKED, 0L); SendDlgItemMessage(hDlg, IDC_OPT_CONF_CTRL, BM_SETCHECK,

1 0

Francois Gouget : winedbg: Make some functions static.
by Alexandre Julliard Jan. 20, 2009

Jan. 20, 2009

Module: wine Branch: master Commit: 5012a57268762ed6a738ad51cc1ea6871304666d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5012a57268762ed6a738ad51c… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 20 09:13:23 2009 +0100 winedbg: Make some functions static. --- programs/winedbg/dbg.y | 5 +++-- programs/winedbg/debugger.h | 2 -- programs/winedbg/tgt_minidump.c | 2 +- programs/winedbg/winedbg.c | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 33ca896..7d1e44e 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -37,6 +37,7 @@ int dbg_lex(void); static int dbg_error(const char*); +static void parser(const char*); %} @@ -548,7 +549,7 @@ void parser_handle(HANDLE input) dbg_parser_output = out_copy; } -void parser(const char* filename) +static void parser(const char* filename) { HANDLE h = CreateFile(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0L, 0); if (h != INVALID_HANDLE_VALUE) @@ -558,7 +559,7 @@ void parser(const char* filename) } } -int dbg_error(const char* s) +static int dbg_error(const char* s) { dbg_printf("%s\n", s); return 0; diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 319f0dc..2c7ef4e 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -301,7 +301,6 @@ extern void break_restart_execution(int count); extern int break_add_condition(int bpnum, struct expr* exp); /* dbg.y */ -extern void parser(const char*); extern void parser_handle(HANDLE); extern int input_read_line(const char* pfx, char* buffer, int size); extern int input_fetch_entire_line(const char* pfx, char** line); @@ -436,7 +435,6 @@ extern struct dbg_type types_find_pointer(const struct dbg_type* type); extern struct dbg_type types_find_type(unsigned long linear, const char* name, enum SymTagEnum tag); /* winedbg.c */ -extern void dbg_outputA(const char* buffer, int len); extern void dbg_outputW(const WCHAR* buffer, int len); extern const char* dbg_W2A(const WCHAR* buffer, unsigned len); #ifdef __GNUC__ diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index a9f92db..bcdadcf 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -133,7 +133,7 @@ static BOOL WINAPI tgt_process_minidump_write(HANDLE hProcess, void* addr, return FALSE; } -BOOL CALLBACK validate_file(PCWSTR name, void* user) +static BOOL CALLBACK validate_file(PCWSTR name, void* user) { return FALSE; /* get the first file we find !! */ } diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index d1df695..a801425 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -99,7 +99,7 @@ struct dbg_internal_var dbg_internal_vars[DBG_IV_LAST]; const struct dbg_internal_var* dbg_context_vars; static HANDLE dbg_houtput; -void dbg_outputA(const char* buffer, int len) +static void dbg_outputA(const char* buffer, int len) { static char line_buff[4096]; static unsigned int line_pos;

1 0

Francois Gouget : wineconsole: Make some functions static.
by Alexandre Julliard Jan. 20, 2009

Jan. 20, 2009

Module: wine Branch: master Commit: e7ec428c479b4f10163a3f5b54e809f3bb70eb53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7ec428c479b4f10163a3f5b5… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 20 09:15:26 2009 +0100 wineconsole: Make some functions static. --- programs/wineconsole/user.c | 2 +- programs/wineconsole/winecon_private.h | 1 - programs/wineconsole/winecon_user.h | 2 -- programs/wineconsole/wineconsole.c | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 1c00f31..391e833 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -318,7 +318,7 @@ void WCUSER_DumpTextMetric(const TEXTMETRIC* tm, DWORD ft) * * */ -BOOL WCUSER_AreFontsEqual(const struct config_data* config, const LOGFONT* lf) +static BOOL WCUSER_AreFontsEqual(const struct config_data* config, const LOGFONT* lf) { return lf->lfHeight == config->cell_height && lf->lfWeight == config->font_weight && diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h index 7ea5dc0..9823a8b 100644 --- a/programs/wineconsole/winecon_private.h +++ b/programs/wineconsole/winecon_private.h @@ -83,7 +83,6 @@ extern BOOL WINECON_SetHistorySize(HANDLE hConIn, int size); extern int WINECON_GetHistoryMode(HANDLE hConIn); extern BOOL WINECON_SetHistoryMode(HANDLE hConIn, int mode); extern BOOL WINECON_GetConsoleTitle(HANDLE hConIn, WCHAR* buffer, size_t len); -extern void WINECON_FetchCells(struct inner_data* data, int upd_tp, int upd_bm); extern int WINECON_GrabChanges(struct inner_data* data); extern VOID WINECON_SetConfig(struct inner_data* data, const struct config_data* cfg); diff --git a/programs/wineconsole/winecon_user.h b/programs/wineconsole/winecon_user.h index b630499..51db26c 100644 --- a/programs/wineconsole/winecon_user.h +++ b/programs/wineconsole/winecon_user.h @@ -48,8 +48,6 @@ extern BOOL WCUSER_GetProperties(struct inner_data*, BOOL); extern BOOL WCUSER_ValidateFont(const struct inner_data* data, const LOGFONT* lf); extern BOOL WCUSER_ValidateFontMetric(const struct inner_data* data, const TEXTMETRIC* tm, DWORD fontType); -extern BOOL WCUSER_AreFontsEqual(const struct config_data* config, - const LOGFONT* lf); extern HFONT WCUSER_CopyFont(struct config_data* config, HWND hWnd, const LOGFONT* lf, LONG* el); extern void WCUSER_FillLogFont(LOGFONT* lf, const WCHAR* name, diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 3626383..c5381af 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -64,7 +64,7 @@ static void WINECON_Usage(void) * * updates the local copy of cells (band to update) */ -void WINECON_FetchCells(struct inner_data* data, int upd_tp, int upd_bm) +static void WINECON_FetchCells(struct inner_data* data, int upd_tp, int upd_bm) { SERVER_START_REQ( read_console_output ) {

1 0

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

Jan. 20, 2009

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

Austin English : widl: Fix a compiler warning.
by Alexandre Julliard Jan. 20, 2009

Jan. 20, 2009

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

Mario Kacmar : comctl32: Added Slovak translation.
by Alexandre Julliard Jan. 20, 2009

Jan. 20, 2009

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 Jan. 20, 2009

Jan. 20, 2009

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

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

Jan. 20, 2009

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 Jan. 20, 2009

Jan. 20, 2009

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 Jan. 20, 2009

Jan. 20, 2009

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