May 2009 - Wine-Commits - list.winehq.org

Francois Gouget : riched20: RTF{G, S}et{In, Out}putName() are unused so remove them as well as the corresponding _RTF_Info fields.
by Alexandre Julliard May 26, 2009

May 26, 2009

Module: wine Branch: master Commit: 1914d256a6e055f243bf2ad8ea10406538e956cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1914d256a6e055f243bf2ad8e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 26 00:47:29 2009 +0200 riched20: RTF{G,S}et{In,Out}putName() are unused so remove them as well as the corresponding _RTF_Info fields. --- dlls/riched20/reader.c | 37 ------------------------------------- dlls/riched20/rtf.h | 7 ------- 2 files changed, 0 insertions(+), 44 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index fa1ef79..10aa19e 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -226,10 +226,6 @@ void RTFInit(RTF_Info *info) info->rtfTextBuf[0] = info->pushedTextBuf[0] = '\0'; } - heap_free (info->inputName); - heap_free (info->outputName); - info->inputName = info->outputName = NULL; - for (i = 0; i < rtfMaxClass; i++) RTFSetClassCallback (info, i, NULL); for (i = 0; i < rtfMaxDestination; i++) @@ -278,39 +274,6 @@ void RTFInit(RTF_Info *info) } /* - * Set or get the input or output file name. These are never guaranteed - * to be accurate, only insofar as the calling program makes them so. - */ - -void RTFSetInputName(RTF_Info *info, const char *name) -{ - info->inputName = RTFStrSave (name); - if (info->inputName == NULL) - ERR ("RTFSetInputName: out of memory\n"); -} - - -char *RTFGetInputName(const RTF_Info *info) -{ - return (info->inputName); -} - - -void RTFSetOutputName(RTF_Info *info, const char *name) -{ - info->outputName = RTFStrSave (name); - if (info->outputName == NULL) - ERR ("RTFSetOutputName: out of memory\n"); -} - - -char *RTFGetOutputName(const RTF_Info *info) -{ - return (info->outputName); -} - - -/* * Install or return a writer callback for a destination type */ diff --git a/dlls/riched20/rtf.h b/dlls/riched20/rtf.h index 6de440f..e8cfb34 100644 --- a/dlls/riched20/rtf.h +++ b/dlls/riched20/rtf.h @@ -1152,9 +1152,6 @@ struct _RTF_Info { int unicodeLength; /* The length of ANSI representation of Unicode characters */ int codePage; /* Current codepage for text conversion */ - char *inputName; - char *outputName; - ME_InStream *stream; ME_TextEditor *editor; @@ -1191,10 +1188,6 @@ struct _RTF_Info { void RTFInit (RTF_Info *); void RTFDestroy(RTF_Info *info); -void RTFSetInputName (RTF_Info *, const char *); -char *RTFGetInputName (const RTF_Info *); -void RTFSetOutputName (RTF_Info *, const char *); -char *RTFGetOutputName (const RTF_Info *); void RTFSetDestinationCallback (RTF_Info *, int, RTFFuncPtr); void RTFRead (RTF_Info *); int RTFGetToken (RTF_Info *); /* writer should rarely need this */

1 0

Francois Gouget : riched20: Make ME_GetCursorCoordinates() static and remove ME_MustBeWrapped() as it is unused.
by Alexandre Julliard May 26, 2009

May 26, 2009

Module: wine Branch: master Commit: 3d6c53b972258c37038a6ba4023a162f178a05ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d6c53b972258c37038a6ba40… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 26 00:45:31 2009 +0200 riched20: Make ME_GetCursorCoordinates() static and remove ME_MustBeWrapped() as it is unused. --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.h | 3 --- dlls/riched20/run.c | 12 ------------ 3 files changed, 1 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 2151e43..1cb44bc 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -168,7 +168,7 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) } -void +static void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, int *x, int *y, int *height) { diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 8568420..0929e82 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -171,9 +171,6 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, void ME_InsertEndRowFromCursor(ME_TextEditor *editor, int nCursor); BOOL ME_ArrowKey(ME_TextEditor *ed, int nVKey, BOOL extend, BOOL ctrl); -void ME_MustBeWrapped(ME_Context *c, ME_DisplayItem *para); -void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, - int *x, int *y, int *height); int ME_GetCursorOfs(ME_TextEditor *editor, int nCursor); void ME_GetSelection(ME_TextEditor *editor, int *from, int *to); int ME_CountParagraphsBetween(ME_TextEditor *editor, int from, int to); diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 9778ea9..cf6c1fc 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -725,18 +725,6 @@ void ME_CalcRunExtent(ME_Context *c, const ME_Paragraph *para, int startx, ME_Ru } /****************************************************************************** - * ME_MustBeWrapped - * - * This should ensure that the given paragraph is wrapped so that its screen - * row structure may be used. But it doesn't, yet. - */ -void ME_MustBeWrapped(ME_Context *c, ME_DisplayItem *para) -{ - assert(para->type == diParagraph); - /* FIXME */ -} - -/****************************************************************************** * ME_SetSelectionCharFormat * * Applies a style change, either to a current selection, or to insert cursor

1 0

Francois Gouget : rsaenh: Make the mpi functions static, remove mp_signed_bin_size() as it is unused.
by Alexandre Julliard May 26, 2009

May 26, 2009

Module: wine Branch: master Commit: 53f3f441fb30045247651c1f23c5a62a77500a4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=53f3f441fb30045247651c1f2… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 26 00:39:18 2009 +0200 rsaenh: Make the mpi functions static, remove mp_signed_bin_size() as it is unused. --- dlls/rsaenh/mpi.c | 55 +++++++++++++++++++++++++++++++++++++++++------ dlls/rsaenh/tomcrypt.h | 46 ---------------------------------------- 2 files changed, 48 insertions(+), 53 deletions(-) diff --git a/dlls/rsaenh/mpi.c b/dlls/rsaenh/mpi.c index 0c58e39..b1b1c9e 100644 --- a/dlls/rsaenh/mpi.c +++ b/dlls/rsaenh/mpi.c @@ -42,6 +42,53 @@ 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. */ + +/* trim unused digits */ +static void mp_clamp(mp_int *a); + +/* compare |a| to |b| */ +static int mp_cmp_mag(const mp_int *a, const mp_int *b); + +/* Counts the number of lsbs which are zero before the first zero bit */ +static int mp_cnt_lsb(const mp_int *a); + +/* computes a = B**n mod b without division or multiplication useful for + * normalizing numbers in a Montgomery system. + */ +static int mp_montgomery_calc_normalization(mp_int *a, const mp_int *b); + +/* computes x/R == x (mod N) via Montgomery Reduction */ +static int mp_montgomery_reduce(mp_int *a, const mp_int *m, mp_digit mp); + +/* setups the montgomery reduction */ +static int mp_montgomery_setup(const mp_int *a, mp_digit *mp); + +/* Barrett Reduction, computes a (mod b) with a precomputed value c + * + * Assumes that 0 < a <= b*b, note if 0 > a > -(b*b) then you can merely + * compute the reduction as -1 * mp_reduce(mp_abs(a)) [pseudo code]. + */ +static int mp_reduce(mp_int *a, const mp_int *b, const mp_int *c); + +/* reduces a modulo b where b is of the form 2**p - k [0 <= a] */ +static int mp_reduce_2k(mp_int *a, const mp_int *n, mp_digit d); + +/* determines k value for 2k reduction */ +static int mp_reduce_2k_setup(const mp_int *a, mp_digit *d); + +/* used to setup the Barrett reduction for a given modulus b */ +static int mp_reduce_setup(mp_int *a, const mp_int *b); + +/* set to a digit */ +static void mp_set(mp_int *a, mp_digit b); + +/* b = a*a */ +static int mp_sqr(const mp_int *a, mp_int *b); + +/* c = a * a (mod b) */ +static int mp_sqrmod(const mp_int *a, mp_int *b, mp_int *c); + + 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); @@ -3589,7 +3636,7 @@ ERR: } /* determines the setup value */ -int +static int mp_reduce_2k_setup(const mp_int *a, mp_digit *d) { int res, p; @@ -3677,12 +3724,6 @@ int mp_shrink (mp_int * a) return MP_OKAY; } -/* get the size for an signed equivalent */ -int mp_signed_bin_size (const mp_int * a) -{ - return 1 + mp_unsigned_bin_size (a); -} - /* computes b = a*a */ int mp_sqr (const mp_int * a, mp_int * b) diff --git a/dlls/rsaenh/tomcrypt.h b/dlls/rsaenh/tomcrypt.h index aaaac98..49fb352 100644 --- a/dlls/rsaenh/tomcrypt.h +++ b/dlls/rsaenh/tomcrypt.h @@ -249,9 +249,6 @@ int mp_shrink(mp_int *a); #define mp_iseven(a) (((a)->used > 0 && (((a)->dp[0] & 1) == 0)) ? MP_YES : MP_NO) #define mp_isodd(a) (((a)->used > 0 && (((a)->dp[0] & 1) == 1)) ? MP_YES : MP_NO) -/* set to a digit */ -void mp_set(mp_int *a, mp_digit b); - /* set a 32-bit const */ int mp_set_int(mp_int *a, unsigned long b); @@ -270,14 +267,8 @@ int mp_copy(const mp_int *a, mp_int *b); /* inits and copies, a = b */ int mp_init_copy(mp_int *a, const mp_int *b); -/* trim unused digits */ -void mp_clamp(mp_int *a); - /* ---> digit manipulation <--- */ -/* Counts the number of lsbs which are zero before the first zero bit */ -int mp_cnt_lsb(const mp_int *a); - /* I Love Earth! */ /* makes a pseudo-random int of a given size */ @@ -301,9 +292,6 @@ int mp_neg(mp_int *a, mp_int *b); /* compare a to b */ int mp_cmp(const mp_int *a, const mp_int *b); -/* compare |a| to |b| */ -int mp_cmp_mag(const mp_int *a, const mp_int *b); - /* c = a + b */ int mp_add(mp_int *a, mp_int *b, mp_int *c); @@ -313,9 +301,6 @@ int mp_sub(mp_int *a, mp_int *b, mp_int *c); /* c = a * b */ 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); - /* c = a mod b, 0 <= c < b */ int mp_mod(const mp_int *a, mp_int *b, mp_int *c); @@ -344,9 +329,6 @@ int mp_submod(mp_int *a, mp_int *b, mp_int *c, mp_int *d); /* d = a * b (mod c) */ int mp_mulmod(const mp_int *a, const mp_int *b, mp_int *c, mp_int *d); -/* c = a * a (mod b) */ -int mp_sqrmod(const mp_int *a, mp_int *b, mp_int *c); - /* c = 1/a (mod b) */ int mp_invmod(const mp_int *a, mp_int *b, mp_int *c); @@ -374,39 +356,12 @@ int mp_is_square(mp_int *arg, int *ret); /* computes the jacobi c = (a | n) (or Legendre if b is prime) */ int mp_jacobi(mp_int *a, mp_int *n, int *c); -/* used to setup the Barrett reduction for a given modulus b */ -int mp_reduce_setup(mp_int *a, const mp_int *b); - -/* Barrett Reduction, computes a (mod b) with a precomputed value c - * - * Assumes that 0 < a <= b*b, note if 0 > a > -(b*b) then you can merely - * compute the reduction as -1 * mp_reduce(mp_abs(a)) [pseudo code]. - */ -int mp_reduce(mp_int *a, const mp_int *b, const mp_int *c); - -/* setups the montgomery reduction */ -int mp_montgomery_setup(const mp_int *a, mp_digit *mp); - -/* computes a = B**n mod b without division or multiplication useful for - * normalizing numbers in a Montgomery system. - */ -int mp_montgomery_calc_normalization(mp_int *a, const mp_int *b); - -/* computes x/R == x (mod N) via Montgomery Reduction */ -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); /* returns true if a can be reduced with mp_reduce_2k */ int mp_reduce_is_2k(mp_int *a); -/* determines k value for 2k reduction */ -int mp_reduce_2k_setup(const mp_int *a, mp_digit *d); - -/* reduces a modulo b where b is of the form 2**p - k [0 <= a] */ -int mp_reduce_2k(mp_int *a, const mp_int *n, mp_digit d); - /* d = a**b (mod c) */ int mp_exptmod(const mp_int *a, const mp_int *b, mp_int *c, mp_int *d); @@ -466,7 +421,6 @@ int mp_unsigned_bin_size(const mp_int *a); int mp_read_unsigned_bin(mp_int *a, const unsigned char *b, int c); int mp_to_unsigned_bin(const mp_int *a, unsigned char *b); -int mp_signed_bin_size(const mp_int *a); int mp_read_signed_bin(mp_int *a, unsigned char *b, int c); int mp_to_signed_bin(mp_int *a, unsigned char *b);

1 0

Henri Verbeet : d3d10core: Implement ID3D10Device::CreateVertexShader().
by Alexandre Julliard May 26, 2009

May 26, 2009

Module: wine Branch: master Commit: fcee1b709cd24184cc0c01973b8ee772236f7278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcee1b709cd24184cc0c01973… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 26 09:15:12 2009 +0200 d3d10core: Implement ID3D10Device::CreateVertexShader(). --- dlls/d3d10core/d3d10core_private.h | 3 +++ dlls/d3d10core/device.c | 25 ++++++++++++++++++++++++- dlls/d3d10core/shader.c | 2 ++ 3 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 7600e23..4828ab6 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -141,6 +141,9 @@ struct d3d10_vertex_shader { const struct ID3D10VertexShaderVtbl *vtbl; LONG refcount; + + IWineD3DVertexShader *wined3d_shader; + struct wined3d_shader_signature output_signature; }; /* ID3D10GeometryShader */ diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index bbc527b..ce18eb7 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -970,9 +970,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateInputLayout(ID3D10Device *if static HRESULT STDMETHODCALLTYPE d3d10_device_CreateVertexShader(ID3D10Device *iface, const void *byte_code, SIZE_T byte_code_length, ID3D10VertexShader **shader) { + struct d3d10_device *This = (struct d3d10_device *)iface; struct d3d10_vertex_shader *object; + struct d3d10_shader_info shader_info; + HRESULT hr; - FIXME("iface %p, byte_code %p, byte_code_length %lu, shader %p stub!\n", + TRACE("iface %p, byte_code %p, byte_code_length %lu, shader %p\n", iface, byte_code, byte_code_length, shader); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); @@ -985,6 +988,26 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateVertexShader(ID3D10Device *i object->vtbl = &d3d10_vertex_shader_vtbl; object->refcount = 1; + shader_info.output_signature = &object->output_signature; + hr = shader_extract_from_dxbc(byte_code, byte_code_length, &shader_info); + if (FAILED(hr)) + { + ERR("Failed to extract shader, hr %#x\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + hr = IWineD3DDevice_CreateVertexShader(This->wined3d_device, NULL, + shader_info.shader_code, &object->output_signature, + &object->wined3d_shader, (IUnknown *)object); + if (FAILED(hr)) + { + ERR("CreateVertexShader failed, hr %#x\n", hr); + shader_free_signature(&object->output_signature); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + *shader = (ID3D10VertexShader *)object; return S_OK; diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 41b5a1a..582d2a8 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -176,6 +176,8 @@ static ULONG STDMETHODCALLTYPE d3d10_vertex_shader_Release(ID3D10VertexShader *i if (!refcount) { + IWineD3DVertexShader_Release(This->wined3d_shader); + shader_free_signature(&This->output_signature); HeapFree(GetProcessHeap(), 0, This); }

1 0

Nikolay Sivov : comctl32/listview: LVM_GETVIEWRECT is unsupported on LVS_REPORT style.
by Alexandre Julliard May 26, 2009

May 26, 2009

Module: wine Branch: master Commit: 6b63fce757fc92d934dd23c3f8b9b05f8f5456f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b63fce757fc92d934dd23c3f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue May 26 02:25:05 2009 +0400 comctl32/listview: LVM_GETVIEWRECT is unsupported on LVS_REPORT style. --- dlls/comctl32/listview.c | 18 +++++++++--------- dlls/comctl32/tests/listview.c | 2 -- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 129f3cb..f9b4983 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -2372,6 +2372,7 @@ static BOOL LISTVIEW_Arrange(LISTVIEW_INFO *infoPtr, INT nAlignCode) /*** * DESCRIPTION: * Retrieves the bounding rectangle of all the items, not offset by Origin. + * For LVS_REPORT always returns empty rectangle. * * PARAMETER(S): * [I] infoPtr : valid pointer to the listview structure @@ -2412,11 +2413,6 @@ static void LISTVIEW_GetAreaRect(const LISTVIEW_INFO *infoPtr, LPRECT lprcView) lprcView->right = x * infoPtr->nItemWidth; lprcView->bottom = y * infoPtr->nItemHeight; break; - - case LVS_REPORT: - lprcView->right = infoPtr->nItemWidth; - lprcView->bottom = infoPtr->nItemCount * infoPtr->nItemHeight; - break; } } @@ -2439,10 +2435,14 @@ static BOOL LISTVIEW_GetViewRect(const LISTVIEW_INFO *infoPtr, LPRECT lprcView) TRACE("(lprcView=%p)\n", lprcView); if (!lprcView) return FALSE; - - LISTVIEW_GetOrigin(infoPtr, &ptOrigin); - LISTVIEW_GetAreaRect(infoPtr, lprcView); - OffsetRect(lprcView, ptOrigin.x, ptOrigin.y); + + LISTVIEW_GetAreaRect(infoPtr, lprcView); + + if ((infoPtr->dwStyle & LVS_TYPEMASK) != LVS_REPORT) + { + LISTVIEW_GetOrigin(infoPtr, &ptOrigin); + OffsetRect(lprcView, ptOrigin.x, ptOrigin.y); + } TRACE("lprcView=%s\n", wine_dbgstr_rect(lprcView)); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 39224da..13d8fde 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2475,11 +2475,9 @@ static void test_getviewrect(void) r = SendMessage(hwnd, LVM_GETVIEWRECT, 0, (LPARAM)&rect); expect(TRUE, r); /* left is set to (2e31-1) - XP SP2 */ -todo_wine { expect(0, rect.right); expect(0, rect.top); expect(0, rect.bottom); -} /* switch to LVS_ICON */ SetWindowLong(hwnd, GWL_STYLE, GetWindowLong(hwnd, GWL_STYLE) & ~LVS_REPORT);

1 0

Nikolay Sivov : comctl32/mru: Fix test failures on Win9x.
by Alexandre Julliard May 26, 2009

May 26, 2009

Module: wine Branch: master Commit: 713898df0c4424e28056aaf308ba9efa1147181f URL: http://source.winehq.org/git/wine.git/?a=commit;h=713898df0c4424e28056aaf30… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon May 25 23:51:54 2009 +0400 comctl32/mru: Fix test failures on Win9x. --- dlls/comctl32/tests/mru.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index ea05e02..c4da87b 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -430,9 +430,9 @@ static void test_CreateMRUListLazyA(void) HKEY hKey; CREATEMRULISTA listA = { 0 }; - if (!pCreateMRUListLazyA) + if (!pCreateMRUListLazyA || !pFreeMRUList) { - win_skip("CreateMRUListLazyA entry point 157 not found\n"); + win_skip("CreateMRUListLazyA or FreeMRUList entry points not found\n"); return; } @@ -455,7 +455,9 @@ static void test_CreateMRUListLazyA(void) listA.hKey = hKey; listA.lpszSubKey = NULL; hMRU = pCreateMRUListLazyA(&listA, 0, 0, 0); - ok(hMRU == NULL, "Expected NULL handle, got %p\n", hMRU); + ok(hMRU == NULL || broken(hMRU != NULL), /* Win9x */ + "Expected NULL handle, got %p\n", hMRU); + if (hMRU) pFreeMRUList(hMRU); } static void test_EnumMRUList(void)

1 0

Nikolay Sivov : comctl32/listview: Improve item position calculating in LVS_REPORT.
by Alexandre Julliard May 26, 2009

May 26, 2009

Module: wine Branch: master Commit: 2a32ce744c43cfaf664e998d0604eaff5933df48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a32ce744c43cfaf664e998d0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue May 26 04:04:36 2009 +0400 comctl32/listview: Improve item position calculating in LVS_REPORT. --- dlls/comctl32/listview.c | 5 ++++- dlls/comctl32/tests/listview.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index f9b4983..79ac0e3 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1920,7 +1920,10 @@ static void LISTVIEW_GetItemOrigin(const LISTVIEW_INFO *infoPtr, INT nItem, LPPO } else /* LVS_REPORT */ { - lpptPosition->x = 0; + lpptPosition->x = REPORT_MARGINX; + /* item is always at zero indexed column */ + if (DPA_GetPtrCount(infoPtr->hdpaColumns) > 0) + lpptPosition->x += LISTVIEW_GetColumnInfo(infoPtr, 0)->rcHeader.left; lpptPosition->y = nItem * infoPtr->nItemHeight; } } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 1a1ae06..47477a4 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2538,7 +2538,7 @@ static void test_getitemposition(void) memset(&rect, 0, sizeof(rect)); SendMessage(header, HDM_GETITEMRECT, 0, (LPARAM)&rect); /* some padding? */ - todo_wine expect(2, pt.x); + expect(2, pt.x); /* offset by header height */ expect(rect.bottom - rect.top, pt.y);

1 0

Piotr Caban : jscript: Added implementation of Math_atan.
by Alexandre Julliard May 26, 2009

May 26, 2009

Module: wine Branch: master Commit: 79151a2adfac6ee58a8a4047837a21e36bfa400c URL: http://source.winehq.org/git/wine.git/?a=commit;h=79151a2adfac6ee58a8a40478… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon May 25 22:05:21 2009 +0200 jscript: Added implementation of Math_atan. --- dlls/jscript/math.c | 18 ++++++++++++++++-- dlls/jscript/tests/api.js | 27 +++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index f027441..f67a83d 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -202,8 +202,22 @@ static HRESULT Math_asin(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS * static HRESULT Math_atan(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + if(retv) num_set_val(retv, atan(num_val(&v))); + return S_OK; } static HRESULT Math_atan2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 09d85d1..2b338a9 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -692,6 +692,33 @@ ok(isNaN(tmp), "Math.asin(Infinity) is not NaN"); tmp = Math.asin(-Infinity); ok(isNaN(tmp), "Math.asin(-Infinity) is not NaN"); +tmp = Math.atan(0); +ok(Math.floor(tmp*100) === 0, "Math.atan(0) = " + tmp); + +tmp = Math.atan(1); +ok(Math.floor(tmp*100) === 78, "Math.atan(1) = " + tmp); + +tmp = Math.atan(-1); +ok(Math.floor(tmp*100) === -79, "Math.atan(-1) = " + tmp); + +tmp = Math.atan(true); +ok(Math.floor(tmp*100) === 78, "Math.atan(true) = " + tmp); + +tmp = Math.atan(false); +ok(Math.floor(tmp*100) === 0, "Math.atan(false) = " + tmp); + +tmp = Math.atan(); +ok(isNaN(tmp), "Math.atan() is not NaN"); + +tmp = Math.atan(NaN); +ok(isNaN(tmp), "Math.atan(NaN) is not NaN"); + +tmp = Math.atan(Infinity); +ok(Math.floor(tmp*100) === 157, "Math.atan(Infinity) = " + tmp); + +tmp = Math.atan(-Infinity); +ok(Math.floor(tmp*100) === -158, "Math.atan(Infinity) = " + tmp); + var func = function (a) { var a = 1; if(a) return;

1 0

Piotr Caban : jscript: Added Math_atan2 implementation.
by Alexandre Julliard May 26, 2009

May 26, 2009

Module: wine Branch: master Commit: d940755c71b0454ec0a07a9db6d24758c23f96b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d940755c71b0454ec0a07a9db… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon May 25 22:05:35 2009 +0200 jscript: Added Math_atan2 implementation. --- dlls/jscript/math.c | 22 ++++++++++++++++++- dlls/jscript/tests/api.js | 48 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index f67a83d..2c45f8f 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -223,8 +223,26 @@ static HRESULT Math_atan(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS * static HRESULT Math_atan2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v1, v2; + HRESULT hres; + + TRACE("\n"); + + if(arg_cnt(dp)<2) { + if(retv) num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v1); + if(FAILED(hres)) + return hres; + + hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &v2); + if(FAILED(hres)) + return hres; + + if(retv) num_set_val(retv, atan2(num_val(&v1), num_val(&v2))); + return S_OK; } /* ECMA-262 3rd Edition 15.8.2.6 */ diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 2b338a9..3da1cc7 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -719,6 +719,54 @@ ok(Math.floor(tmp*100) === 157, "Math.atan(Infinity) = " + tmp); tmp = Math.atan(-Infinity); ok(Math.floor(tmp*100) === -158, "Math.atan(Infinity) = " + tmp); +tmp = Math.atan2(0, 0); +ok(Math.floor(tmp*100) === 0, "Math.atan2(0, 0) = " + tmp); + +tmp = Math.atan2(0, 1); +ok(Math.floor(tmp*100) === 0, "Math.atan2(0, 1) = " + tmp); + +tmp = Math.atan2(0, Infinity); +ok(Math.floor(tmp*100) === 0, "Math.atan2(0, Infinity) = " + tmp); + +tmp = Math.atan2(0, -1); +ok(Math.floor(tmp*100) === 314, "Math.atan2(0, -1) = " + tmp); + +tmp = Math.atan2(0, -Infinity); +ok(Math.floor(tmp*100) === 314, "Math.atan2(0, -Infinity) = " + tmp); + +tmp = Math.atan2(1, 0); +ok(Math.floor(tmp*100) === 157, "Math.atan2(1, 0) = " + tmp); + +tmp = Math.atan2(Infinity, 0); +ok(Math.floor(tmp*100) === 157, "Math.atan2(Infinity, 0) = " + tmp); + +tmp = Math.atan2(-1, 0); +ok(Math.floor(tmp*100) === -158, "Math.atan2(-1, 0) = " + tmp); + +tmp = Math.atan2(-Infinity, 0); +ok(Math.floor(tmp*100) === -158, "Math.atan2(-Infinity, 0) = " + tmp); + +tmp = Math.atan2(1, 1); +ok(Math.floor(tmp*100) === 78, "Math.atan2(1, 1) = " + tmp); + +tmp = Math.atan2(-1, -1); +ok(Math.floor(tmp*100) === -236, "Math.atan2(-1, -1) = " + tmp); + +tmp = Math.atan2(-1, 1); +ok(Math.floor(tmp*100) === -79, "Math.atan2(-1, 1) = " + tmp); + +tmp = Math.atan2(Infinity, Infinity); +ok(Math.floor(tmp*100) === 78, "Math.atan2(Infinity, Infinity) = " + tmp); + +tmp = Math.atan2(Infinity, -Infinity, 1); +ok(Math.floor(tmp*100) === 235, "Math.atan2(Infinity, -Infinity, 1) = " + tmp); + +tmp = Math.atan2(); +ok(isNaN(tmp), "Math.atan2() is not NaN"); + +tmp = Math.atan2(1); +ok(isNaN(tmp), "Math.atan2(1) is not NaN"); + var func = function (a) { var a = 1; if(a) return;

1 0

Nikolay Sivov : comctl32/listview: A couple of LVM_GETITEMPOSITION tests.
by Alexandre Julliard May 26, 2009

May 26, 2009

Module: wine Branch: master Commit: 25c775a036ed68f2f1991b0611e4876bdb99b7cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=25c775a036ed68f2f1991b061… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue May 26 03:47:45 2009 +0400 comctl32/listview: A couple of LVM_GETITEMPOSITION tests. --- dlls/comctl32/tests/listview.c | 73 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 13d8fde..1a1ae06 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -185,6 +185,17 @@ static const struct message single_getdispinfo_parent_seq[] = { { 0 } }; +static const struct message getitemposition_seq1[] = { + { LVM_GETITEMPOSITION, sent|id, 0, 0, LISTVIEW_ID }, + { 0 } +}; + +static const struct message getitemposition_seq2[] = { + { LVM_GETITEMPOSITION, sent|id, 0, 0, LISTVIEW_ID }, + { HDM_GETITEMRECT, sent|id, 0, 0, HEADER_ID }, + { 0 } +}; + struct subclass_info { WNDPROC oldproc; @@ -2493,6 +2504,66 @@ static void test_getviewrect(void) DestroyWindow(hwnd); } +static void test_getitemposition(void) +{ + HWND hwnd, header; + DWORD r; + POINT pt; + RECT rect; + + hwnd = create_listview_control(0); + ok(hwnd != NULL, "failed to create a listview window\n"); + header = subclass_header(hwnd); + + /* LVS_REPORT, single item, no columns added */ + insert_item(hwnd, 0); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + pt.x = pt.y = -1; + r = SendMessage(hwnd, LVM_GETITEMPOSITION, 0, (LPARAM)&pt); + expect(TRUE, r); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, getitemposition_seq1, "get item position 1", FALSE); + + /* LVS_REPORT, single item, single column */ + insert_column(hwnd, 0); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + pt.x = pt.y = -1; + r = SendMessage(hwnd, LVM_GETITEMPOSITION, 0, (LPARAM)&pt); + expect(TRUE, r); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, getitemposition_seq2, "get item position 2", TRUE); + + memset(&rect, 0, sizeof(rect)); + SendMessage(header, HDM_GETITEMRECT, 0, (LPARAM)&rect); + /* some padding? */ + todo_wine expect(2, pt.x); + /* offset by header height */ + expect(rect.bottom - rect.top, pt.y); + + DestroyWindow(hwnd); +} + +static void test_columnscreation(void) +{ + HWND hwnd, header; + DWORD r; + + hwnd = create_listview_control(0); + ok(hwnd != NULL, "failed to create a listview window\n"); + + insert_item(hwnd, 0); + + /* headers columns aren't created automatically */ + header = (HWND)SendMessage(hwnd, LVM_GETHEADER, 0, 0); + ok(IsWindow(header), "Expected header handle\n"); + r = SendMessage(header, HDM_GETITEMCOUNT, 0, 0); + expect(0, r); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -2538,6 +2609,8 @@ START_TEST(listview) test_setredraw(); test_hittest(); test_getviewrect(); + test_getitemposition(); + test_columnscreation(); DestroyWindow(hwndparent); }

1 0