October 2008 - Wine-commits

Rob Shearman : jscript: Fix shift/reduce conflict in IfStatement rule.
by Alexandre Julliard 15 Oct '08

15 Oct '08

Module: wine Branch: master Commit: 169f92b5a807425972674d207736fa4b4b4743e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=169f92b5a807425972674d207… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Oct 15 14:10:07 2008 +0100 jscript: Fix shift/reduce conflict in IfStatement rule. The famous "dangling else" problem. --- dlls/jscript/parser.y | 5 ++++- dlls/jscript/tests/lang.js | 12 ++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 565f08b..af3d35d 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -253,6 +253,9 @@ static source_elements_t *source_elements_add_function(source_elements_t*,functi %type <literal> BooleanLiteral %type <srcptr> KFunction +%nonassoc LOWER_THAN_ELSE +%nonassoc kELSE + %% /* ECMA-262 3rd Edition 14 */ @@ -389,7 +392,7 @@ ExpressionStatement IfStatement : kIF '(' Expression ')' Statement kELSE Statement { $$ = new_if_statement(ctx, $3, $5, $7); } - | kIF '(' Expression ')' Statement + | kIF '(' Expression ')' Statement %prec LOWER_THAN_ELSE { $$ = new_if_statement(ctx, $3, $5, NULL); } /* ECMA-262 3rd Edition 12.6 */ diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 16dadbd..b989645 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -773,6 +773,18 @@ try { ok(false, "deleteTest not throwed exception?"); }catch(ex) {} +if (false) + if (true) + ok(false, "if evaluated"); + else + ok(false, "else should be associated with nearest if statement"); + +if (true) + if (false) + ok(false, "if evaluated"); + else + ok(true, "else should be associated with nearest if statement"); + ok(isNaN(0.5) === false, "isNaN(0.5) !== false"); ok(isNaN() === true, "isNaN() !== true");

1 0

Aric Stewart : user32: Make sure our vertical line count is at least 1 even if there is an oversized font in the edit control .
by Alexandre Julliard 15 Oct '08

15 Oct '08

Module: wine Branch: master Commit: 7b9e827a75e871a90e36844976e9ae1180119056 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b9e827a75e871a90e3684497… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 15 07:30:22 2008 -0500 user32: Make sure our vertical line count is at least 1 even if there is an oversized font in the edit control. --- dlls/user32/edit.c | 29 +++++++++++++++++---------- dlls/user32/tests/edit.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 11 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 4b4e286..ba76786 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -430,6 +430,12 @@ static inline LRESULT DefWindowProcT(HWND hwnd, UINT msg, WPARAM wParam, LPARAM return DefWindowProcA(hwnd, msg, wParam, lParam); } +static inline INT get_vertical_line_count(EDITSTATE *es) +{ + INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + return max(1,vlc); +} + /********************************************************************* * * EditWndProc_common @@ -1807,7 +1813,7 @@ static void EDIT_SL_InvalidateText(EDITSTATE *es, INT start, INT end) */ static void EDIT_ML_InvalidateText(EDITSTATE *es, INT start, INT end) { - INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + INT vlc = get_vertical_line_count(es); INT sl = EDIT_EM_LineFromChar(es, start); INT el = EDIT_EM_LineFromChar(es, end); INT sc; @@ -2234,7 +2240,8 @@ static void EDIT_PaintLine(EDITSTATE *es, HDC dc, INT line, BOOL rev) LRESULT pos; if (es->style & ES_MULTILINE) { - INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + INT vlc = get_vertical_line_count(es); + if ((line < es->y_offset) || (line > es->y_offset + vlc) || (line >= es->line_count)) return; } else if (line) @@ -2361,8 +2368,8 @@ static void EDIT_AdjustFormatRect(EDITSTATE *es) { INT fw, vlc, max_x_offset, max_y_offset; - vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; - es->format_rect.bottom = es->format_rect.top + max(1, vlc) * es->line_height; + vlc = get_vertical_line_count(es); + es->format_rect.bottom = es->format_rect.top + vlc * es->line_height; /* correct es->x_offset */ fw = es->format_rect.right - es->format_rect.left; @@ -3256,7 +3263,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, LPCWSTR lpsz_replac if (es->style & ES_MULTILINE) { INT st = min(es->selection_start, es->selection_end); - INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + INT vlc = get_vertical_line_count(es); hrgn = CreateRectRgn(0, 0, 0, 0); EDIT_BuildLineDefs_ML(es, st, st + strl, @@ -3420,7 +3427,7 @@ static LRESULT EDIT_EM_Scroll(EDITSTATE *es, INT action) return (LRESULT)FALSE; } if (dy) { - INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + INT vlc = get_vertical_line_count(es); /* check if we are going to move too far */ if(es->y_offset + dy > es->line_count - vlc) dy = es->line_count - vlc - es->y_offset; @@ -3451,7 +3458,7 @@ static void EDIT_EM_ScrollCaret(EDITSTATE *es) l = EDIT_EM_LineFromChar(es, es->selection_end); x = (short)LOWORD(EDIT_EM_PosFromChar(es, es->selection_end, es->flags & EF_AFTER_WRAP)); - vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + vlc = get_vertical_line_count(es); if (l >= es->y_offset + vlc) dy = l - vlc + 1 - es->y_offset; if (l < es->y_offset) @@ -4956,7 +4963,7 @@ static void EDIT_WM_Paint(EDITSTATE *es, HDC hdc) SetTextColor(dc, GetSysColor(COLOR_GRAYTEXT)); GetClipBox(dc, &rcRgn); if (es->style & ES_MULTILINE) { - INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + INT vlc = get_vertical_line_count(es); for (i = es->y_offset ; i <= min(es->y_offset + vlc, es->y_offset + es->line_count - 1) ; i++) { EDIT_GetLineRect(es, i, 0, -1, &rcLine); if (IntersectRect(&rc, &rcRgn, &rcLine)) @@ -5301,7 +5308,7 @@ static LRESULT EDIT_WM_VScroll(EDITSTATE *es, INT action, INT pos) INT vlc, new_y; /* Sanity check */ if(pos < 0 || pos > 100) return 0; - vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + vlc = get_vertical_line_count(es); new_y = pos * (es->line_count - vlc) / 100; dy = es->line_count ? (new_y - es->y_offset) : 0; TRACE("line_count=%d, y_offset=%d, pos=%d, dy = %d\n", @@ -5319,7 +5326,7 @@ static LRESULT EDIT_WM_VScroll(EDITSTATE *es, INT action, INT pos) INT vlc, new_y; /* Sanity check */ if(pos < 0 || pos > 100) return 0; - vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + vlc = get_vertical_line_count(es); new_y = pos * (es->line_count - vlc) / 100; dy = es->line_count ? (new_y - es->y_offset) : 0; TRACE("line_count=%d, y_offset=%d, pos=%d, dy = %d\n", @@ -5350,7 +5357,7 @@ static LRESULT EDIT_WM_VScroll(EDITSTATE *es, INT action, INT pos) else { /* Assume default scroll range 0-100 */ - INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + INT vlc = get_vertical_line_count(es); ret = es->line_count ? es->y_offset * 100 / (es->line_count - vlc) : 0; } TRACE("EM_GETTHUMB: returning %ld\n", ret); diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 0c5a678..b70dae5 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1989,6 +1989,53 @@ static void UnregisterWindowClasses (void) UnregisterClassA(szEditTextPositionClass, hinst); } +void test_fontsize(void) +{ + HWND hwEdit; + HFONT hfont; + LOGFONT lf; + LONG r; + char szLocalString[MAXLEN]; + + memset(&lf,0,sizeof(LOGFONTA)); + strcpy(lf.lfFaceName,"Arial"); + lf.lfHeight = -300; /* taller than the edit box */ + lf.lfWeight = 500; + hfont = CreateFontIndirect(&lf); + + trace("EDIT: Oversized font (Multi line)\n"); + hwEdit= CreateWindow("EDIT", NULL, ES_MULTILINE|ES_AUTOHSCROLL, + 0, 0, 150, 50, NULL, NULL, hinst, NULL); + + SendMessage(hwEdit,WM_SETFONT,(WPARAM)hfont,0); + + if (winetest_interactive) + ShowWindow (hwEdit, SW_SHOW); + + r = SendMessage(hwEdit, WM_CHAR, 'A', 1); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + r = SendMessage(hwEdit, WM_CHAR, 'B', 1); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + r = SendMessage(hwEdit, WM_CHAR, 'C', 1); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + GetWindowText(hwEdit, szLocalString, MAXLEN); + ok(lstrcmp(szLocalString, "ABC")==0, + "Wrong contents of edit: %s\n", szLocalString); + + r = SendMessage(hwEdit, EM_POSFROMCHAR,0,0); + ok(r != -1,"EM_POSFROMCHAR failed index 0\n"); + r = SendMessage(hwEdit, EM_POSFROMCHAR,1,0); + ok(r != -1,"EM_POSFROMCHAR failed index 1\n"); + r = SendMessage(hwEdit, EM_POSFROMCHAR,2,0); + ok(r != -1,"EM_POSFROMCHAR failed index 2\n"); + r = SendMessage(hwEdit, EM_POSFROMCHAR,3,0); + ok(r == -1,"EM_POSFROMCHAR succeeded index 3\n"); + + DestroyWindow (hwEdit); + DeleteObject(hfont); +} + START_TEST(edit) { hinst = GetModuleHandleA(NULL); @@ -2012,6 +2059,7 @@ START_TEST(edit) test_wantreturn_edit_dialog(); test_singleline_wantreturn_edit_dialog(); test_child_edit_wmkeydown(); + test_fontsize(); UnregisterWindowClasses(); }

1 0

Frans Kool : wordpad: Corrected Dutch translations.
by Alexandre Julliard 15 Oct '08

15 Oct '08

Module: wine Branch: master Commit: 730d23046dc263fe2db6ef715d239decb484b0e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=730d23046dc263fe2db6ef715… Author: Frans Kool <Frans.Kool(a)Gmail.com> Date: Wed Oct 15 15:45:57 2008 +0200 wordpad: Corrected Dutch translations. --- programs/wordpad/Nl.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index 536a88b..0a53658 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -240,4 +240,5 @@ BEGIN STRING_WRITE_ACCESS_DENIED, "Onvoldoende rechten om het bestand op te slaan." STRING_OPEN_FAILED, "Bestand kon niet geopend worden." STRING_OPEN_ACCESS_DENIED, "Onvoldoende rechten om het bestand te openen." + STRING_PRINTING_NOT_IMPLEMENTED, "Printen is nog niet geimplementeerd" END

1 0

Kai Blin : comdlg32: Avoid possible NULL pointer dereference (Coverity).
by Alexandre Julliard 15 Oct '08

15 Oct '08

Module: wine Branch: master Commit: 4ff3d9954eb55369ea4439ee4c56fb8ff93549b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ff3d9954eb55369ea4439ee4… Author: Kai Blin <kai.blin(a)gmail.com> Date: Tue Oct 14 12:56:16 2008 +0200 comdlg32: Avoid possible NULL pointer dereference (Coverity). --- dlls/comdlg32/filedlg31.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index c8fcf7e..30409af 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -312,8 +312,10 @@ static void FD31_UpdateResult(const FD31_DATA *lfs, const WCHAR *tmpstr) if (lenstr2 > 3) tmpstr2[lenstr2++]='\\'; lstrcpynW(tmpstr2+lenstr2, tmpstr, BUFFILE-lenstr2); - if (ofnW->lpstrFile) - lstrcpynW(ofnW->lpstrFile, tmpstr2, ofnW->nMaxFile); + if (!ofnW->lpstrFile) + return; + + lstrcpynW(ofnW->lpstrFile, tmpstr2, ofnW->nMaxFile); /* set filename offset */ p = PathFindFileNameW(ofnW->lpstrFile);

1 0

Rob Shearman : write: Close the thread and process handles returned by CreateProcessW.
by Alexandre Julliard 15 Oct '08

15 Oct '08

Module: wine Branch: master Commit: b7cfa5899684b940a7be1f499e656c7dea2a78fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7cfa5899684b940a7be1f499… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Oct 13 23:37:04 2008 +0100 write: Close the thread and process handles returned by CreateProcessW. --- programs/write/write.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/write/write.c b/programs/write/write.c index f60d40c..8012355 100644 --- a/programs/write/write.c +++ b/programs/write/write.c @@ -45,6 +45,8 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar if (!CreateProcessW(path, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &stinf, &info)) goto failed; + CloseHandle(info.hProcess); + CloseHandle(info.hThread); return 0; failed:

1 0

Rob Shearman : rsaenh: Add a value to the empty braces in the initialiser for aOIDDescriptor in build_hash_signature .
by Alexandre Julliard 15 Oct '08

15 Oct '08

Module: wine Branch: master Commit: b069b53bd9b210c3cee0a36fe489f2e78c20f23c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b069b53bd9b210c3cee0a36fe… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Oct 15 14:12:27 2008 +0100 rsaenh: Add a value to the empty braces in the initialiser for aOIDDescriptor in build_hash_signature. An empty initialiser isn't supported on some compilers like MSVC. --- dlls/rsaenh/rsaenh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index e681d69..b935ee3 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1259,7 +1259,7 @@ static BOOL build_hash_signature(BYTE *pbSignature, DWORD dwLen, ALG_ID aiAlgid, 0x86, 0xf7, 0x0d, 0x02, 0x05, 0x05, 0x00, 0x04, 0x10 } }, { CALG_SHA, 15, { 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, 0x05, 0x00, 0x04, 0x14 } }, - { 0, 0, {} } + { 0, 0, { 0 } } }; DWORD dwIdxOID, i, j;

1 0

Marcus Meissner : jscript: Check for This->ctx and This->site earlier ( Coverity).
by Alexandre Julliard 15 Oct '08

15 Oct '08

Module: wine Branch: master Commit: 4dceb1f8bf82058f35c154998ef0a7284b0b53fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dceb1f8bf82058f35c154998… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Oct 14 09:59:33 2008 +0200 jscript: Check for This->ctx and This->site earlier (Coverity). --- dlls/jscript/jscript.c | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 41fb40f..081f468 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -306,23 +306,24 @@ static HRESULT WINAPI JScript_Close(IActiveScript *iface) clear_script_queue(This); - if(This->ctx->named_items) { - named_item_t *iter, *iter2; + if(This->ctx) { + if(This->ctx->named_items) { + named_item_t *iter, *iter2; - iter = This->ctx->named_items; - while(iter) { - iter2 = iter->next; + iter = This->ctx->named_items; + while(iter) { + iter2 = iter->next; - IDispatch_Release(iter->disp); - heap_free(iter); - iter = iter2; - } + IDispatch_Release(iter->disp); + heap_free(iter); + iter = iter2; + } - This->ctx->named_items = NULL; - } + This->ctx->named_items = NULL; + } - if(This->ctx) { - change_state(This, SCRIPTSTATE_CLOSED); + if (This->site) + change_state(This, SCRIPTSTATE_CLOSED); if(This->ctx->script_disp) { IDispatchEx_Release(_IDispatchEx_(This->ctx->script_disp));

1 0

Rob Shearman : shell32: Fix the position where WINAPI is specified in the LPFNOFN typedef.
by Alexandre Julliard 15 Oct '08

15 Oct '08

Module: wine Branch: master Commit: 07b325f8f2b5ee9e6f3f3d88579d6888312a6231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07b325f8f2b5ee9e6f3f3d885… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Oct 15 14:12:20 2008 +0100 shell32: Fix the position where WINAPI is specified in the LPFNOFN typedef. --- dlls/shell32/dialogs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c index b64d306..77eea18 100644 --- a/dlls/shell32/dialogs.c +++ b/dlls/shell32/dialogs.c @@ -49,7 +49,7 @@ typedef struct UINT uFlags ; } RUNFILEDLGPARAMS ; -typedef BOOL (*WINAPI LPFNOFN) (OPENFILENAMEW *) ; +typedef BOOL (WINAPI * LPFNOFN) (OPENFILENAMEW *) ; WINE_DEFAULT_DEBUG_CHANNEL(shell); static INT_PTR CALLBACK RunDlgProc (HWND, UINT, WPARAM, LPARAM) ;

1 0

Rob Shearman : rsaenh: Make some functions used in only one file static.
by Alexandre Julliard 15 Oct '08

15 Oct '08

Module: wine Branch: master Commit: 0a2efbb1ccb73da5943baa204aad670ed9b9c9a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a2efbb1ccb73da5943baa204… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Oct 15 14:13:26 2008 +0100 rsaenh: Make some functions used in only one file static. --- dlls/rsaenh/mpi.c | 35 ++++++++++++++++++++++++----------- dlls/rsaenh/tomcrypt.h | 21 --------------------- 2 files changed, 24 insertions(+), 32 deletions(-) diff --git a/dlls/rsaenh/mpi.c b/dlls/rsaenh/mpi.c index 20c04fc..5e10ec8 100644 --- a/dlls/rsaenh/mpi.c +++ b/dlls/rsaenh/mpi.c @@ -39,13 +39,26 @@ static const int KARATSUBA_MUL_CUTOFF = 88, /* Min. number of digits before Karatsuba multiplication is used. */ KARATSUBA_SQR_CUTOFF = 128; /* Min. number of digits before Karatsuba squaring is used. */ +static void bn_reverse(unsigned char *s, int len); +static int s_mp_add(mp_int *a, mp_int *b, mp_int *c); +static int s_mp_exptmod (const mp_int * G, const mp_int * X, mp_int * P, mp_int * Y); +#define s_mp_mul(a, b, c) s_mp_mul_digs(a, b, c, (a)->used + (b)->used + 1) +static int s_mp_mul_digs(const mp_int *a, const mp_int *b, mp_int *c, int digs); +static int s_mp_mul_high_digs(const mp_int *a, const mp_int *b, mp_int *c, int digs); +static int s_mp_sqr(const mp_int *a, mp_int *b); +static int s_mp_sub(const mp_int *a, const mp_int *b, mp_int *c); +static int mp_exptmod_fast(const mp_int *G, const mp_int *X, mp_int *P, mp_int *Y, int mode); +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); + /* computes the modular inverse via binary extended euclidean algorithm, * that is c = 1/a mod b * * Based on slow invmod except this is optimized for the case where b is * odd as per HAC Note 14.64 on pp. 610 */ -int +static int fast_mp_invmod (const mp_int * a, mp_int * b, mp_int * c) { mp_int x, y, u, v, B, D; @@ -175,7 +188,7 @@ __ERR:mp_clear_multi (&x, &y, &u, &v, &B, &D, NULL); * * Based on Algorithm 14.32 on pp.601 of HAC. */ -int +static int fast_mp_montgomery_reduce (mp_int * x, const mp_int * n, mp_digit rho) { int ix, res, olduse; @@ -335,7 +348,7 @@ fast_mp_montgomery_reduce (mp_int * x, const mp_int * n, mp_digit rho) * Based on Algorithm 14.12 on pp.595 of HAC. * */ -int +static int fast_s_mp_mul_digs (const mp_int * a, const mp_int * b, mp_int * c, int digs) { int olduse, res, pa, ix, iz; @@ -414,7 +427,7 @@ fast_s_mp_mul_digs (const mp_int * a, const mp_int * b, mp_int * c, int digs) * * Based on Algorithm 14.12 on pp.595 of HAC. */ -int +static int fast_s_mp_mul_high_digs (const mp_int * a, const mp_int * b, mp_int * c, int digs) { int olduse, res, pa, ix, iz; @@ -512,7 +525,7 @@ Remove W2 and don't memset W */ -int fast_s_mp_sqr (const mp_int * a, mp_int * b) +static int fast_s_mp_sqr (const mp_int * a, mp_int * b) { int olduse, res, pa, ix, iz; mp_digit W[MP_WARRAY], *tmpx; @@ -3847,7 +3860,7 @@ mp_zero (mp_int * a) } /* reverse an array, used for radix code */ -void +static void bn_reverse (unsigned char *s, int len) { int ix, iy; @@ -3865,7 +3878,7 @@ bn_reverse (unsigned char *s, int len) } /* low level addition, based on HAC pp.594, Algorithm 14.7 */ -int +static int s_mp_add (mp_int * a, mp_int * b, mp_int * c) { mp_int *x; @@ -3952,7 +3965,7 @@ s_mp_add (mp_int * a, mp_int * b, mp_int * c) return MP_OKAY; } -int s_mp_exptmod (const mp_int * G, const mp_int * X, mp_int * P, mp_int * Y) +static int s_mp_exptmod (const mp_int * G, const mp_int * X, mp_int * P, mp_int * Y) { mp_int M[256], res, mu; mp_digit buf; @@ -4163,7 +4176,7 @@ __M: * HAC pp. 595, Algorithm 14.12 Modified so you can control how * many digits of output are created. */ -int +static int s_mp_mul_digs (const mp_int * a, const mp_int * b, mp_int * c, int digs) { mp_int t; @@ -4232,7 +4245,7 @@ s_mp_mul_digs (const mp_int * a, const mp_int * b, mp_int * c, int digs) /* multiplies |a| * |b| and does not compute the lower digs digits * [meant to get the higher part of the product] */ -int +static int s_mp_mul_high_digs (const mp_int * a, const mp_int * b, mp_int * c, int digs) { mp_int t; @@ -4288,7 +4301,7 @@ s_mp_mul_high_digs (const mp_int * a, const mp_int * b, mp_int * c, int digs) } /* low level squaring, b = a*a, HAC pp.596-597, Algorithm 14.16 */ -int +static int s_mp_sqr (const mp_int * a, mp_int * b) { mp_int t; diff --git a/dlls/rsaenh/tomcrypt.h b/dlls/rsaenh/tomcrypt.h index b76757c..4348620 100644 --- a/dlls/rsaenh/tomcrypt.h +++ b/dlls/rsaenh/tomcrypt.h @@ -574,27 +574,6 @@ int mp_fwrite(mp_int *a, int radix, FILE *stream); #define mp_todecimal(M, S) mp_toradix((M), (S), 10) #define mp_tohex(M, S) mp_toradix((M), (S), 16) -/* lowlevel functions, do not call! */ -int s_mp_add(mp_int *a, mp_int *b, mp_int *c); -int s_mp_sub(const mp_int *a, const mp_int *b, mp_int *c); -#define s_mp_mul(a, b, c) s_mp_mul_digs(a, b, c, (a)->used + (b)->used + 1) -int fast_s_mp_mul_digs(const mp_int *a, const mp_int *b, mp_int *c, int digs); -int s_mp_mul_digs(const mp_int *a, const mp_int *b, mp_int *c, int digs); -int fast_s_mp_mul_high_digs(const mp_int *a, const mp_int *b, mp_int *c, int digs); -int s_mp_mul_high_digs(const mp_int *a, const mp_int *b, mp_int *c, int digs); -int fast_s_mp_sqr(const mp_int *a, mp_int *b); -int s_mp_sqr(const mp_int *a, mp_int *b); -int mp_karatsuba_mul(const mp_int *a, const mp_int *b, mp_int *c); -int mp_toom_mul(mp_int *a, mp_int *b, mp_int *c); -int mp_karatsuba_sqr(const mp_int *a, mp_int *b); -int mp_toom_sqr(mp_int *a, mp_int *b); -int fast_mp_invmod(const mp_int *a, mp_int *b, mp_int *c); -int mp_invmod_slow (const mp_int * a, mp_int * b, mp_int * c); -int fast_mp_montgomery_reduce(mp_int *a, const mp_int *m, mp_digit mp); -int mp_exptmod_fast(const mp_int *G, const mp_int *X, mp_int *P, mp_int *Y, int mode); -int s_mp_exptmod (const mp_int * G, const mp_int * X, mp_int * P, mp_int * Y); -void bn_reverse(unsigned char *s, int len); - extern const char *mp_s_rmap; #define PK_PRIVATE 0 /* PK private keys */

1 0

Henri Verbeet : wined3d: Simplify texture target handling in surface_blt_to_drawable().
by Alexandre Julliard 15 Oct '08

15 Oct '08

Module: wine Branch: master Commit: e22bda24c6a24131dbb19269d2f7cd0b2d67381f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e22bda24c6a24131dbb19269d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 15 13:35:32 2008 +0200 wined3d: Simplify texture target handling in surface_blt_to_drawable(). --- dlls/wined3d/surface.c | 192 +++++++++++++++++++++--------------------------- 1 files changed, 84 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e22bda24c6a24131dbb19…

1 0