Ros-diffs June 2009

ros-diffs@reactos.org

21 participants
496 discussions

[cwittich] 41325: sync rsaenh with wine 1.1.23

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jun 7 14:46:04 2009 New Revision: 41325 URL: http://svn.reactos.org/svn/reactos?rev=41325&view=rev Log: sync rsaenh with wine 1.1.23 Modified: trunk/reactos/dll/win32/rsaenh/mpi.c trunk/reactos/dll/win32/rsaenh/tomcrypt.h Modified: trunk/reactos/dll/win32/rsaenh/mpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/mpi.c?rev… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/mpi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/mpi.c [iso-8859-1] Sun Jun 7 14:46:04 2009 @@ -41,6 +41,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); @@ -3589,7 +3636,7 @@ } /* determines the setup value */ -int +static int mp_reduce_2k_setup(const mp_int *a, mp_digit *d) { int res, p; @@ -3675,12 +3722,6 @@ a->alloc = a->used; } 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 */ Modified: trunk/reactos/dll/win32/rsaenh/tomcrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/tomcrypt.… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/tomcrypt.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/tomcrypt.h [iso-8859-1] Sun Jun 7 14:46:04 2009 @@ -249,9 +249,6 @@ #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,13 +267,7 @@ /* 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! */ @@ -301,9 +292,6 @@ /* 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 @@ /* 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 @@ /* 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,38 +356,11 @@ /* 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_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);

15 years, 5 months

[cwittich] 41324: partial sync of shell32 shfldr_netplaces

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jun 7 14:43:50 2009 New Revision: 41324 URL: http://svn.reactos.org/svn/reactos?rev=41324&view=rev Log: partial sync of shell32 shfldr_netplaces Modified: trunk/reactos/dll/win32/shell32/shfldr_netplaces.c Modified: trunk/reactos/dll/win32/shell32/shfldr_netplaces.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_n… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_netplaces.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_netplaces.c [iso-8859-1] Sun Jun 7 14:43:50 2009 @@ -44,9 +44,9 @@ #define _IPersistFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2))) #define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset); -#define _IUnknown_(This) (IUnknown*)&(This->lpVtbl) -#define _IShellFolder_(This) (IShellFolder*)&(This->lpVtbl) -#define _IPersistFolder2_(This) (IPersistFolder2*)&(This->lpVtblPersistFolder2) +#define _IUnknown_(This) ((IUnknown*)&(This)->lpVtbl) +#define _IShellFolder_(This) ((IShellFolder*)&(This)->lpVtbl) +#define _IPersistFolder2_(This) (&(This)->lpVtblPersistFolder2) static shvheader NetworkPlacesSFHeader[] = { {IDS_SHV_COLUMN8, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, @@ -76,7 +76,7 @@ if (pUnkOuter) return CLASS_E_NOAGGREGATION; - sf = (IGenericSFImpl *) HeapAlloc ( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof (IGenericSFImpl)); + sf = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof (IGenericSFImpl)); if (!sf) return E_OUTOFMEMORY; @@ -85,7 +85,7 @@ sf->lpVtblPersistFolder2 = &vt_NP_PersistFolder2; sf->pidlRoot = _ILCreateNetHood(); /* my qualified pidl */ - if (!SUCCEEDED (IUnknown_QueryInterface (_IUnknown_ (sf), riid, ppv))) + if (FAILED (IUnknown_QueryInterface (_IUnknown_ (sf), riid, ppv))) { IUnknown_Release (_IUnknown_ (sf)); return E_NOINTERFACE; @@ -255,7 +255,7 @@ HRESULT hr = E_INVALIDARG; TRACE ("(%p)->(hwnd=%p,%s,%p)\n", This, - hwndOwner, shdebugstr_guid (riid), ppvOut); + hwndOwner, shdebugstr_guid (riid), ppvOut); if (!ppvOut) return hr;

15 years, 5 months

[cwittich] 41323: sync gdiplus_winetest with wine 1.1.23

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jun 7 14:10:52 2009 New Revision: 41323 URL: http://svn.reactos.org/svn/reactos?rev=41323&view=rev Log: sync gdiplus_winetest with wine 1.1.23 Modified: trunk/rostests/winetests/gdiplus/graphics.c Modified: trunk/rostests/winetests/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/graphic… ============================================================================== --- trunk/rostests/winetests/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/graphics.c [iso-8859-1] Sun Jun 7 14:10:52 2009 @@ -22,8 +22,10 @@ #include "gdiplus.h" #include "wingdi.h" #include "wine/test.h" +#include <math.h> #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) +#define expectf(expected, got) ok(fabs(expected - got) < 0.0001, "Expected %.2f, got %.2f\n", expected, got) #define TABLE_LEN (23) static void test_constructor_destructor(void) @@ -767,16 +769,11 @@ GpStatus status; GpGraphics *graphics = NULL; HDC hdc = GetDC(0); - GpPointF ptf[5]; - INT i; - - status = GdipCreateFromHDC(hdc, &graphics); - expect(Ok, status); - - for(i = 0; i < 5; i++){ - ptf[i].X = 200.0 + i * 50.0 * (i % 2); - ptf[i].Y = 200.0 + i * 50.0 * !(i % 2); - } + GpPointF ptf[2]; + GpPoint pt[2]; + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); /* NULL arguments */ status = GdipTransformPoints(NULL, CoordinateSpacePage, CoordinateSpaceWorld, NULL, 0); @@ -787,6 +784,101 @@ expect(InvalidParameter, status); status = GdipTransformPoints(graphics, CoordinateSpacePage, CoordinateSpaceWorld, ptf, -1); expect(InvalidParameter, status); + + ptf[0].X = 1.0; + ptf[0].Y = 0.0; + ptf[1].X = 0.0; + ptf[1].Y = 1.0; + status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, ptf, 2); + expect(Ok, status); + expectf(1.0, ptf[0].X); + expectf(0.0, ptf[0].Y); + expectf(0.0, ptf[1].X); + expectf(1.0, ptf[1].Y); + + status = GdipTranslateWorldTransform(graphics, 5.0, 5.0, MatrixOrderAppend); + expect(Ok, status); + status = GdipSetPageUnit(graphics, UnitPixel); + expect(Ok, status); + status = GdipSetPageScale(graphics, 3.0); + expect(Ok, status); + + ptf[0].X = 1.0; + ptf[0].Y = 0.0; + ptf[1].X = 0.0; + ptf[1].Y = 1.0; + status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, ptf, 2); + expect(Ok, status); + expectf(18.0, ptf[0].X); + expectf(15.0, ptf[0].Y); + expectf(15.0, ptf[1].X); + expectf(18.0, ptf[1].Y); + + ptf[0].X = 1.0; + ptf[0].Y = 0.0; + ptf[1].X = 0.0; + ptf[1].Y = 1.0; + status = GdipTransformPoints(graphics, CoordinateSpacePage, CoordinateSpaceWorld, ptf, 2); + expect(Ok, status); + expectf(6.0, ptf[0].X); + expectf(5.0, ptf[0].Y); + expectf(5.0, ptf[1].X); + expectf(6.0, ptf[1].Y); + + ptf[0].X = 1.0; + ptf[0].Y = 0.0; + ptf[1].X = 0.0; + ptf[1].Y = 1.0; + status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpacePage, ptf, 2); + expect(Ok, status); + expectf(3.0, ptf[0].X); + expectf(0.0, ptf[0].Y); + expectf(0.0, ptf[1].X); + expectf(3.0, ptf[1].Y); + + ptf[0].X = 18.0; + ptf[0].Y = 15.0; + ptf[1].X = 15.0; + ptf[1].Y = 18.0; + status = GdipTransformPoints(graphics, CoordinateSpaceWorld, CoordinateSpaceDevice, ptf, 2); + expect(Ok, status); + expectf(1.0, ptf[0].X); + expectf(0.0, ptf[0].Y); + expectf(0.0, ptf[1].X); + expectf(1.0, ptf[1].Y); + + ptf[0].X = 6.0; + ptf[0].Y = 5.0; + ptf[1].X = 5.0; + ptf[1].Y = 6.0; + status = GdipTransformPoints(graphics, CoordinateSpaceWorld, CoordinateSpacePage, ptf, 2); + expect(Ok, status); + expectf(1.0, ptf[0].X); + expectf(0.0, ptf[0].Y); + expectf(0.0, ptf[1].X); + expectf(1.0, ptf[1].Y); + + ptf[0].X = 3.0; + ptf[0].Y = 0.0; + ptf[1].X = 0.0; + ptf[1].Y = 3.0; + status = GdipTransformPoints(graphics, CoordinateSpacePage, CoordinateSpaceDevice, ptf, 2); + expect(Ok, status); + expectf(1.0, ptf[0].X); + expectf(0.0, ptf[0].Y); + expectf(0.0, ptf[1].X); + expectf(1.0, ptf[1].Y); + + pt[0].X = 1; + pt[0].Y = 0; + pt[1].X = 0; + pt[1].Y = 1; + status = GdipTransformPointsI(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 2); + expect(Ok, status); + expect(18, pt[0].X); + expect(15, pt[0].Y); + expect(15, pt[1].X); + expect(18, pt[1].Y); GdipDeleteGraphics(graphics); ReleaseDC(0, hdc);

15 years, 5 months

[cwittich] 41322: update README.WINE

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jun 7 14:02:02 2009 New Revision: 41322 URL: http://svn.reactos.org/svn/reactos?rev=41322&view=rev Log: update README.WINE Modified: trunk/reactos/dll/win32/user32/misc/ddeclient.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/user32/misc/ddeclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/ddec… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/ddeclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/ddeclient.c [iso-8859-1] Sun Jun 7 14:02:02 2009 @@ -20,7 +20,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <user32.h> Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Jun 7 14:02:02 2009 @@ -230,8 +230,8 @@ reactos/dll/win32/user32/controls/static.c # Synced to Wine-1_1_22 reactos/dll/win32/user32/misc/dde.c # Synced to wine 1.1.17 (dde_misc.c) - reactos/dll/win32/user32/misc/ddeclient.c # Synced to wine 1.1.17 - reactos/dll/win32/user32/misc/ddeserver.c # Synced to wine 1.1.17 + reactos/dll/win32/user32/misc/ddeclient.c # Synced to Wine-1_1_23 + reactos/dll/win32/user32/misc/ddeserver.c # Synced to Wine-1_1_23 reactos/dll/win32/user32/misc/exticon.c # Synced to Wine-1_1_22 reactos/dll/win32/user32/misc/resources.c # Forked? reactos/dll/win32/user32/misc/winhelp.c # Last sync date unknown

15 years, 5 months

[cwittich] 41321: -formatting fixes -update README.WINE

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jun 7 13:41:22 2009 New Revision: 41321 URL: http://svn.reactos.org/svn/reactos?rev=41321&view=rev Log: -formatting fixes -update README.WINE Modified: trunk/reactos/dll/win32/user32/misc/wsprintf.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/user32/misc/wsprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/wspr… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/wsprintf.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/wsprintf.c [iso-8859-1] Sun Jun 7 13:41:22 2009 @@ -279,6 +279,7 @@ if (format->flags & WPRINTF_PREFIX_HEX) len += 2; return len; } + /*********************************************************************** * wvsnprintfA (internal) @@ -484,6 +485,7 @@ return (maxlen > 1) ? (INT)(p - buffer) : -1; } + /*********************************************************************** * wvsprintfA (USER32.@) */ @@ -502,6 +504,7 @@ INT res = wvsnprintfW( buffer, 1024, spec, args ); return ( res == -1 ) ? 1024 : res; } + /*********************************************************************** * wsprintfA (USER32.@) @@ -517,6 +520,7 @@ return ( res == -1 ) ? 1024 : res; } + /*********************************************************************** * wsprintfW (USER32.@) */ Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Jun 7 13:41:22 2009 @@ -235,7 +235,7 @@ reactos/dll/win32/user32/misc/exticon.c # Synced to Wine-1_1_22 reactos/dll/win32/user32/misc/resources.c # Forked? reactos/dll/win32/user32/misc/winhelp.c # Last sync date unknown - reactos/dll/win32/user32/misc/wsprintf.c # Synced to Wine-1_1_13 + reactos/dll/win32/user32/misc/wsprintf.c # Synced to Wine-1_1_23 reactos/dll/win32/user32/windows/defwnd.c # Forked reactos/dll/win32/user32/windows/draw.c # Forked at Wine-20020904 (uitools.c)

15 years, 5 months

[cwittich] 41320: fix build

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jun 7 12:53:46 2009 New Revision: 41320 URL: http://svn.reactos.org/svn/reactos?rev=41320&view=rev Log: fix build Modified: trunk/reactos/include/psdk/shlguid.h Modified: trunk/reactos/include/psdk/shlguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlguid.h?rev… ============================================================================== --- trunk/reactos/include/psdk/shlguid.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlguid.h [iso-8859-1] Sun Jun 7 12:53:46 2009 @@ -58,6 +58,7 @@ /* avoid duplicate definitions with shobjidl.h (FIXME) */ +/* DEFINE_GUID(IID_IDockingWindow, 0x012dd920L, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); */ /* DEFINE_OLEGUID(IID_IShellPropSheetExt, 0x000214E9L, 0, 0); */ /* DEFINE_OLEGUID(IID_IExtractIconA, 0x000214EBL, 0, 0); */ /* DEFINE_OLEGUID(IID_IExtractIconW, 0x000214FAL, 0, 0); */ @@ -100,7 +101,6 @@ #define IID_IShellExecuteHook WINELIB_NAME_AW(IID_IShellExecuteHook) #define IID_INewShortcutHook WINELIB_NAME_AW(IID_INewShortcutHook) -DEFINE_GUID(IID_IDockingWindow, 0x012dd920L, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); DEFINE_GUID(IID_IDockingWindowSite, 0x2A342FC2L, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); DEFINE_GUID(IID_IInputObject, 0x068284FAA, 0x6A48, 0x11D0, 0x8C, 0x78, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xB4); DEFINE_GUID(IID_IInputObjectSite, 0x0F1DB8392, 0x7331, 0x11D0, 0x8C, 0x99, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8);

15 years, 5 months

[cwittich] 41319: sync shlguid.h with wine 1.1.23

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jun 7 12:43:36 2009 New Revision: 41319 URL: http://svn.reactos.org/svn/reactos?rev=41319&view=rev Log: sync shlguid.h with wine 1.1.23 Modified: trunk/reactos/include/psdk/shlguid.h Modified: trunk/reactos/include/psdk/shlguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlguid.h?rev… ============================================================================== --- trunk/reactos/include/psdk/shlguid.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlguid.h [iso-8859-1] Sun Jun 7 12:43:36 2009 @@ -19,76 +19,72 @@ #ifndef __WINE_SHLGUID_H #define __WINE_SHLGUID_H -#define DEFINE_SHLGUID(name, l, w1, w2) DEFINE_OLEGUID(name,l,w1,w2) +DEFINE_OLEGUID(CLSID_ShellDesktop, 0x00021400L, 0, 0); +DEFINE_OLEGUID(CLSID_ShellLink, 0x00021401L, 0, 0); -DEFINE_GUID(IID_IShellFolderViewCB, 0x2047E320L, 0xF2A9, 0x11CE, 0xAE, 0x65, 0x08, 0x00, 0x2B, 0x2E, 0x12, 0x62); - -DEFINE_SHLGUID(CLSID_ShellDesktop, 0x00021400L, 0, 0); -DEFINE_SHLGUID(CLSID_ShellLink, 0x00021401L, 0, 0); - -DEFINE_SHLGUID(CATID_BrowsableShellExt, 0x00021490L, 0, 0); -DEFINE_SHLGUID(CATID_BrowseInPlace, 0x00021491L, 0, 0); -DEFINE_SHLGUID(CATID_DeskBand, 0x00021492L, 0, 0); -DEFINE_SHLGUID(CATID_InfoBand, 0x00021493L, 0, 0); -DEFINE_SHLGUID(CATID_CommBand, 0x00021494L, 0, 0); +DEFINE_OLEGUID(CATID_BrowsableShellExt, 0x00021490L, 0, 0); +DEFINE_OLEGUID(CATID_BrowseInPlace, 0x00021491L, 0, 0); +DEFINE_OLEGUID(CATID_DeskBand, 0x00021492L, 0, 0); +DEFINE_OLEGUID(CATID_InfoBand, 0x00021493L, 0, 0); +DEFINE_OLEGUID(CATID_CommBand, 0x00021494L, 0, 0); /* shell32 formatids */ -DEFINE_SHLGUID(FMTID_Intshcut, 0x000214A0L, 0, 0); -DEFINE_SHLGUID(FMTID_InternetSite, 0x000214A1L, 0, 0); +DEFINE_OLEGUID(FMTID_Intshcut, 0x000214A0L, 0, 0); +DEFINE_OLEGUID(FMTID_InternetSite, 0x000214A1L, 0, 0); /* command group ids */ -DEFINE_SHLGUID(CGID_Explorer, 0x000214D0L, 0, 0); -DEFINE_SHLGUID(CGID_ShellDocView, 0x000214D1L, 0, 0); -DEFINE_SHLGUID(CGID_ShellServiceObject, 0x000214D2L, 0, 0); -DEFINE_SHLGUID(CGID_ExplorerBarDoc, 0x000214D3L, 0, 0); +DEFINE_OLEGUID(CGID_Explorer, 0x000214D0L, 0, 0); +DEFINE_OLEGUID(CGID_ShellDocView, 0x000214D1L, 0, 0); +DEFINE_OLEGUID(CGID_ShellServiceObject, 0x000214D2L, 0, 0); +DEFINE_OLEGUID(CGID_ExplorerBarDoc, 0x000214D3L, 0, 0); -DEFINE_SHLGUID(IID_IShellIcon, 0x000214E5L, 0, 0); -DEFINE_SHLGUID(IID_IShellDetails, 0x000214ECL, 0, 0); -DEFINE_SHLGUID(IID_IDelayedRelease, 0x000214EDL, 0, 0); -DEFINE_SHLGUID(IID_IShellCopyHookA, 0x000214EFL, 0, 0); -DEFINE_SHLGUID(IID_IFileViewerA, 0x000214F0L, 0, 0); -DEFINE_SHLGUID(IID_IFileViewerSite, 0x000214F3L, 0, 0); -DEFINE_SHLGUID(IID_IPropSheetPage, 0x000214F6L, 0, 0); -DEFINE_SHLGUID(IID_IFileViewerW, 0x000214F8L, 0, 0); -DEFINE_SHLGUID(IID_IShellCopyHookW, 0x000214FCL, 0, 0); -DEFINE_SHLGUID(IID_IRemoteComputer, 0x000214FEL, 0, 0); -DEFINE_SHLGUID(IID_IQueryInfo, 0x00021500L, 0, 0); +DEFINE_OLEGUID(IID_IShellIcon, 0x000214E5L, 0, 0); +DEFINE_OLEGUID(IID_IShellDetails, 0x000214ECL, 0, 0); +DEFINE_OLEGUID(IID_IDelayedRelease, 0x000214EDL, 0, 0); +DEFINE_OLEGUID(IID_IShellCopyHookA, 0x000214EFL, 0, 0); +DEFINE_OLEGUID(IID_IFileViewerA, 0x000214F0L, 0, 0); +DEFINE_OLEGUID(IID_IFileViewerSite, 0x000214F3L, 0, 0); +DEFINE_OLEGUID(IID_IPropSheetPage, 0x000214F6L, 0, 0); +DEFINE_OLEGUID(IID_IFileViewerW, 0x000214F8L, 0, 0); +DEFINE_OLEGUID(IID_IShellCopyHookW, 0x000214FCL, 0, 0); +DEFINE_OLEGUID(IID_IRemoteComputer, 0x000214FEL, 0, 0); +DEFINE_OLEGUID(IID_IQueryInfo, 0x00021500L, 0, 0); DEFINE_GUID(IID_IACList, 0x77A130B0L,0x94FD,0x11D0,0xA5,0x44,0x00,0xC0,0x4F,0xD7,0xD0,0x62); DEFINE_GUID(IID_IACList2, 0x470141A0L,0x5186,0x11D2,0xBB,0xB6,0x00,0x60,0x97,0x7B,0x46,0x4C); DEFINE_GUID(IID_IObjMgr, 0x00BB2761L,0x6A77,0x11D0,0xA5,0x35,0x00,0xC0,0x4F,0xD7,0xD0,0x62); + DEFINE_GUID(IID_IProgressDialog, 0xEBBC7C04,0x315E,0x11D2,0xB6,0x2F,0x00,0x60,0x97,0xDF,0x5B,0xD4); -DEFINE_GUID(CLSID_NewMenu, 0xd969A300L,0xe7FF,0x11D0,0xA9,0x3B,0x00,0xA0,0xC9,0x0F,0x27,0x19); /* avoid duplicate definitions with shobjidl.h (FIXME) */ -/* DEFINE_SHLGUID(IID_IShellPropSheetExt, 0x000214E9L, 0, 0); */ -/* DEFINE_SHLGUID(IID_IExtractIconA, 0x000214EBL, 0, 0); */ -/* DEFINE_SHLGUID(IID_IExtractIconW, 0x000214FAL, 0, 0); */ -/* DEFINE_SHLGUID(IID_IContextMenu, 0x000214E4L, 0, 0); */ -/* DEFINE_SHLGUID(IID_IContextMenu2, 0x000214F4L, 0, 0); */ -/* DEFINE_SHLGUID(IID_ICommDlgBrowser, 0x000214F1L, 0, 0); */ -/* DEFINE_SHLGUID(IID_IShellBrowser, 0x000214E2L, 0, 0); */ -/* DEFINE_SHLGUID(IID_IShellView, 0x000214E3L, 0, 0); */ -/* DEFINE_SHLGUID(IID_IShellFolder, 0x000214E6L, 0, 0); */ -/* DEFINE_SHLGUID(IID_IShellExtInit, 0x000214E8L, 0, 0); */ -/* DEFINE_SHLGUID(IID_IPersistFolder, 0x000214EAL, 0, 0); */ -/* DEFINE_SHLGUID(IID_IShellLinkA, 0x000214EEL, 0, 0); */ -/* DEFINE_SHLGUID(IID_IEnumIDList, 0x000214F2L, 0, 0); */ -/* DEFINE_SHLGUID(IID_IShellLinkW, 0x000214F9L, 0, 0); */ -/* DEFINE_SHLGUID(IID_IShellExecuteHookA, 0x000214F5L, 0, 0); */ -/* DEFINE_SHLGUID(IID_IShellExecuteHookW, 0x000214FBL, 0, 0); */ -/* DEFINE_SHLGUID(IID_INewShortcutHookA, 0x000214E1L, 0, 0); */ -/* DEFINE_SHLGUID(IID_INewShortcutHookW, 0x000214F7L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellPropSheetExt, 0x000214E9L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IExtractIconA, 0x000214EBL, 0, 0); */ +/* DEFINE_OLEGUID(IID_IExtractIconW, 0x000214FAL, 0, 0); */ +/* DEFINE_OLEGUID(IID_IContextMenu, 0x000214E4L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IContextMenu2, 0x000214F4L, 0, 0); */ +/* DEFINE_OLEGUID(IID_ICommDlgBrowser, 0x000214F1L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellBrowser, 0x000214E2L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellView, 0x000214E3L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellFolder, 0x000214E6L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellExtInit, 0x000214E8L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IPersistFolder, 0x000214EAL, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellLinkA, 0x000214EEL, 0, 0); */ +/* DEFINE_OLEGUID(IID_IEnumIDList, 0x000214F2L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellLinkW, 0x000214F9L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellExecuteHookA, 0x000214F5L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellExecuteHookW, 0x000214FBL, 0, 0); */ +/* DEFINE_OLEGUID(IID_INewShortcutHookA, 0x000214E1L, 0, 0); */ +/* DEFINE_OLEGUID(IID_INewShortcutHookW, 0x000214F7L, 0, 0); */ DEFINE_GUID(CLSID_CUrlHistory, 0x3c374a40, 0xbae4, 0x11cf, 0xbf, 0x7d, 0x00, 0xaa, 0x00, 0x69, 0x46, 0xee); #define SID_SUrlHistory CLSID_CUrlHistory DEFINE_GUID(CLSID_CURLSearchHook, 0xcfbfae00, 0x17a6, 0x11d0, 0x99, 0xcb, 0x00, 0xc0, 0x4f, 0xd6, 0x44, 0x97); -DEFINE_GUID(SID_STopLevelBrowser, 0x4C96BE40L, 0x915C, 0x11CF, 0x99, 0xD3, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37); -DEFINE_GUID(SID_STopWindow, 0x49e1b500L, 0x4636, 0x11d3, 0x97, 0xf7, 0x00, 0xc0, 0x4f, 0x45, 0xd0, 0xb3); -DEFINE_GUID(SID_SCommDlgBrowser, 0x80f30233L, 0xb7df, 0x11d2, 0xa3, 0x3b, 0x00, 0x60, 0x97, 0xdf, 0x5b, 0xd4); +DEFINE_GUID(SID_STopLevelBrowser, 0x4C96BE40, 0x915C, 0x11CF, 0x99, 0xD3, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37); +DEFINE_GUID(SID_STopWindow, 0x49e1b500, 0x4636, 0x11d3, 0x97, 0xf7, 0x00, 0xc0, 0x4f, 0x45, 0xd0, 0xb3); +DEFINE_GUID(SID_SCommDlgBrowser, 0x80f30233, 0xb7df, 0x11d2, 0xa3, 0x3b, 0x00, 0x60, 0x97, 0xdf, 0x5b, 0xd4); #define SID_LinkSite IID_IShellLinkW #define SID_SShellBrowser IID_IShellBrowser @@ -104,6 +100,7 @@ #define IID_IShellExecuteHook WINELIB_NAME_AW(IID_IShellExecuteHook) #define IID_INewShortcutHook WINELIB_NAME_AW(IID_INewShortcutHook) +DEFINE_GUID(IID_IDockingWindow, 0x012dd920L, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); DEFINE_GUID(IID_IDockingWindowSite, 0x2A342FC2L, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); DEFINE_GUID(IID_IInputObject, 0x068284FAA, 0x6A48, 0x11D0, 0x8C, 0x78, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xB4); DEFINE_GUID(IID_IInputObjectSite, 0x0F1DB8392, 0x7331, 0x11D0, 0x8C, 0x99, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); @@ -123,16 +120,19 @@ DEFINE_GUID(CLSID_Printers, 0x2227A280, 0x3AEA, 0x1069, 0xA2, 0xDE, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D); DEFINE_GUID(CLSID_MyDocuments, 0x450d8fba, 0xad25, 0x11d0, 0x98, 0xa8, 0x08, 0x00, 0x36, 0x1b, 0x11, 0x03); DEFINE_GUID(CLSID_FolderShortcut, 0x0AFACED1, 0xE828, 0x11D1, 0x91, 0x87, 0xB5, 0x32, 0xF1, 0xE9, 0x57, 0x5D); + DEFINE_GUID(IID_IQueryAssociations, 0xc46ca590, 0x3c3f, 0x11d2, 0xbe, 0xe6, 0x00, 0x00, 0xf8, 0x05, 0xca, 0x57); + DEFINE_GUID(CLSID_QueryAssociations, 0xa07034fd, 0x6caa, 0x4954, 0xac, 0x3f, 0x97, 0xa2, 0x72, 0x16, 0xf9, 0x8a); DEFINE_GUID(CLSID_DragDropHelper, 0x4657278a, 0x411b, 0x11d2, 0x83, 0x9a, 0x00, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); -DEFINE_GUID(CLSID_AutoComplete, 0x00bb2763, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); -DEFINE_GUID(CLSID_ACLMulti, 0x00bb2765, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); +DEFINE_GUID(CLSID_AutoComplete, 0x00bb2763, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); +DEFINE_GUID(CLSID_ACLMulti, 0x00bb2765, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); DEFINE_GUID(CLSID_ACListISF, 0x03c036f1, 0xa186, 0x11d0, 0x82, 0x4a, 0x00, 0xaa, 0x00, 0x5b, 0x043, 0x83); DEFINE_GUID(CLSID_ProgressDialog, 0xf8383852, 0xfcd3, 0x11d1, 0xa6, 0xb9, 0x0, 0x60, 0x97, 0xdf, 0x5b, 0xd4); + DEFINE_GUID(CLSID_ShellItem, 0x2fe352ea, 0xfd1f, 0x11d2, 0xb1, 0xf4, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e); #define PSGUID_SHELLDETAILS {0x28636aa6, 0x953d, 0x11d2, 0xb5, 0xd6, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0} @@ -165,5 +165,9 @@ DEFINE_GUID(VID_Tile, 0x65f125e5, 0x7be1, 0x4810, 0xba, 0x9d, 0xd2, 0x71, 0xc8, 0x43, 0x2c, 0xe3); DEFINE_GUID(VID_ThumbStrip, 0x8eefa624, 0xd1e9, 0x445b, 0x94, 0xb7, 0x74, 0xfb, 0xce, 0x2e, 0xa1, 0x1a); +/* REACTOS ONLY */ +DEFINE_GUID(CLSID_NewMenu, 0xd969A300L,0xe7FF,0x11D0,0xA9,0x3B,0x00,0xA0,0xC9,0x0F,0x27,0x19); +DEFINE_GUID(IID_IShellFolderViewCB, 0x2047E320L, 0xF2A9, 0x11CE, 0xAE, 0x65, 0x08, 0x00, 0x2B, 0x2E, 0x12, 0x62); +/* END REACTOS ONLY */ #endif /* __WINE_SHLGUID_H */

15 years, 5 months

[dchapyshev] 41318: - Sync gdiplus with Wine 1.1.23

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sun Jun 7 11:59:56 2009 New Revision: 41318 URL: http://svn.reactos.org/svn/reactos?rev=41318&view=rev Log: - Sync gdiplus with Wine 1.1.23 Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.spec trunk/reactos/dll/win32/gdiplus/graphics.c trunk/reactos/dll/win32/gdiplus/graphicspath.c trunk/reactos/dll/win32/gdiplus/image.c Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] Sun Jun 7 11:59:56 2009 @@ -29,15 +29,15 @@ @ stdcall GdipAddPathRectangleI(ptr long long long long) @ stdcall GdipAddPathRectangles(ptr ptr long) @ stdcall GdipAddPathRectanglesI(ptr ptr long) -@ stub GdipAddPathString -@ stub GdipAddPathStringI +@ stdcall GdipAddPathString(ptr wstr long ptr long long ptr ptr) +@ stdcall GdipAddPathStringI(ptr wstr long ptr long long ptr ptr) @ stdcall GdipAlloc(long) @ stdcall GdipBeginContainer2(ptr ptr) -@ stub GdipBeginContainer -@ stub GdipBeginContainerI -@ stub GdipBitmapApplyEffect +@ stdcall GdipBeginContainer(ptr ptr ptr long ptr) +@ stdcall GdipBeginContainerI(ptr ptr ptr long ptr) +@ stdcall GdipBitmapApplyEffect(ptr ptr ptr long ptr ptr) @ stub GdipBitmapConvertFormat -@ stub GdipBitmapCreateApplyEffect +@ stdcall GdipBitmapCreateApplyEffect(ptr long ptr ptr ptr ptr long ptr ptr) @ stub GdipBitmapGetHistogram @ stub GdipBitmapGetHistogramSize @ stdcall GdipBitmapGetPixel(ptr long long ptr) @@ -46,7 +46,7 @@ @ stdcall GdipBitmapSetResolution(ptr long long) @ stdcall GdipBitmapUnlockBits(ptr ptr) @ stdcall GdipClearPathMarkers(ptr) -@ stub GdipCloneBitmapArea +@ stdcall GdipCloneBitmapArea(long long long long long ptr ptr) @ stdcall GdipCloneBitmapAreaI(long long long long long ptr ptr) @ stdcall GdipCloneBrush(ptr ptr) @ stdcall GdipCloneCustomLineCap(ptr ptr) @@ -65,7 +65,7 @@ @ stdcall GdipCombineRegionRect(ptr ptr long) @ stdcall GdipCombineRegionRectI(ptr ptr long) @ stdcall GdipCombineRegionRegion(ptr ptr long) -@ stub GdipComment +@ stdcall GdipComment(ptr long ptr) @ stdcall GdipConvertToEmfPlus(ptr ptr ptr long ptr ptr) @ stub GdipConvertToEmfPlusToFile @ stub GdipConvertToEmfPlusToStream @@ -94,7 +94,7 @@ @ stdcall GdipCreateFromHWND(long ptr) @ stdcall GdipCreateFromHWNDICM(long ptr) @ stdcall GdipCreateHBITMAPFromBitmap(ptr ptr long) -@ stub GdipCreateHICONFromBitmap +@ stdcall GdipCreateHICONFromBitmap(ptr ptr) @ stdcall GdipCreateHalftonePalette() @ stdcall GdipCreateHatchBrush(long long long ptr) @ stdcall GdipCreateImageAttributes(ptr) @@ -109,8 +109,8 @@ @ stdcall GdipCreateMatrix3I(ptr ptr ptr) @ stdcall GdipCreateMatrix(ptr) @ stdcall GdipCreateMetafileFromEmf(ptr long ptr) -@ stub GdipCreateMetafileFromFile -@ stub GdipCreateMetafileFromStream +@ stdcall GdipCreateMetafileFromFile(ptr ptr) +@ stdcall GdipCreateMetafileFromStream(ptr ptr) @ stdcall GdipCreateMetafileFromWmf(ptr long ptr ptr) @ stdcall GdipCreateMetafileFromWmfFile(wstr ptr ptr) @ stdcall GdipCreatePath2(ptr ptr long long ptr) @@ -139,7 +139,7 @@ @ stdcall GdipDeleteBrush(ptr) @ stdcall GdipDeleteCachedBitmap(ptr) @ stdcall GdipDeleteCustomLineCap(ptr) -@ stub GdipDeleteEffect +@ stdcall GdipDeleteEffect(ptr) @ stdcall GdipDeleteFont(ptr) @ stdcall GdipDeleteFontFamily(ptr) @ stdcall GdipDeleteGraphics(ptr) @@ -175,10 +175,10 @@ @ stdcall GdipDrawImage(ptr ptr long long) @ stub GdipDrawImageFX @ stdcall GdipDrawImageI(ptr ptr long long) -@ stub GdipDrawImagePointRect -@ stub GdipDrawImagePointRectI -@ stub GdipDrawImagePoints -@ stub GdipDrawImagePointsI +@ stdcall GdipDrawImagePointRect(ptr ptr long long long long long long long) +@ stdcall GdipDrawImagePointRectI(ptr ptr long long long long long long long) +@ stdcall GdipDrawImagePoints(ptr ptr ptr long) +@ stdcall GdipDrawImagePointsI(ptr ptr ptr long) @ stdcall GdipDrawImagePointsRect(ptr ptr ptr long long long long long long ptr ptr ptr) @ stdcall GdipDrawImagePointsRectI(ptr ptr ptr long long long long long long ptr ptr ptr) @ stdcall GdipDrawImageRect(ptr ptr long long long long) @@ -199,7 +199,7 @@ @ stdcall GdipDrawRectangles(ptr ptr ptr long) @ stdcall GdipDrawRectanglesI(ptr ptr ptr long) @ stdcall GdipDrawString(ptr ptr long ptr ptr ptr ptr) -@ stub GdipEmfToWmfBits +@ stdcall GdipEmfToWmfBits(ptr long ptr long long) @ stdcall GdipEndContainer(ptr ptr) @ stub GdipEnumerateMetafileDestPoint @ stub GdipEnumerateMetafileDestPointI Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] Sun Jun 7 11:59:56 2009 @@ -1116,6 +1116,20 @@ return GdipCreateMetafileFromWmf(hmf, TRUE, placeable, metafile); } +GpStatus WINGDIPAPI GdipCreateMetafileFromFile(GDIPCONST WCHAR *file, + GpMetafile **metafile) +{ + FIXME("(%p, %p): stub\n", file, metafile); + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipCreateMetafileFromStream(IStream *stream, + GpMetafile **metafile) +{ + FIXME("(%p, %p): stub\n", stream, metafile); + return NotImplemented; +} + GpStatus WINGDIPAPI GdipCreateStreamOnFile(GDIPCONST WCHAR * filename, UINT access, IStream **stream) { @@ -1590,6 +1604,36 @@ return Ok; } +GpStatus WINGDIPAPI GdipDrawImagePointRect(GpGraphics *graphics, GpImage *image, + REAL x, REAL y, REAL srcx, REAL srcy, REAL srcwidth, REAL srcheight, + GpUnit srcUnit) +{ + FIXME("(%p, %p, %f, %f, %f, %f, %f, %f, %d): stub\n", graphics, image, x, y, srcx, srcy, srcwidth, srcheight, srcUnit); + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipDrawImagePointRectI(GpGraphics *graphics, GpImage *image, + INT x, INT y, INT srcx, INT srcy, INT srcwidth, INT srcheight, + GpUnit srcUnit) +{ + FIXME("(%p, %p, %d, %d, %d, %d, %d, %d, %d): stub\n", graphics, image, x, y, srcx, srcy, srcwidth, srcheight, srcUnit); + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipDrawImagePoints(GpGraphics *graphics, GpImage *image, + GDIPCONST GpPointF *dstpoints, INT count) +{ + FIXME("(%p, %p, %p, %d): stub\n", graphics, image, dstpoints, count); + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipDrawImagePointsI(GpGraphics *graphics, GpImage *image, + GDIPCONST GpPoint *dstpoints, INT count) +{ + FIXME("(%p, %p, %p, %d): stub\n", graphics, image, dstpoints, count); + return NotImplemented; +} + /* FIXME: partially implemented (only works for rectangular parallelograms) */ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image, GDIPCONST GpPointF *points, INT count, REAL srcx, REAL srcy, REAL srcwidth, @@ -2045,7 +2089,7 @@ POINT corners[4]; WCHAR* stringdup; REAL angle, ang_cos, ang_sin, rel_width, rel_height; - INT sum = 0, height = 0, fit, fitcpy, save_state, i, j, lret, nwidth, + INT sum = 0, height = 0, offsety = 0, fit, fitcpy, save_state, i, j, lret, nwidth, nheight; SIZE size; RECT drawcoord; @@ -2061,8 +2105,21 @@ return NotImplemented; } - if(format) + if(format){ TRACE("may be ignoring some format flags: attr %x\n", format->attr); + + /* Should be no need to explicitly test for StringAlignmentNear as + * that is default behavior if no alignment is passed. */ + if(format->vertalign != StringAlignmentNear){ + RectF bounds; + GdipMeasureString(graphics, string, length, font, rect, format, &bounds, 0, 0); + + if(format->vertalign == StringAlignmentCenter) + offsety = (rect->Height - bounds.Height) / 2; + else if(format->vertalign == StringAlignmentFar) + offsety = (rect->Height - bounds.Height); + } + } if(length == -1) length = lstrlenW(string); @@ -2074,9 +2131,9 @@ SetTextColor(graphics->hdc, brush->lb.lbColor); rectcpy[3].X = rectcpy[0].X = rect->X; - rectcpy[1].Y = rectcpy[0].Y = rect->Y; + rectcpy[1].Y = rectcpy[0].Y = rect->Y + offsety; rectcpy[2].X = rectcpy[1].X = rect->X + rect->Width; - rectcpy[3].Y = rectcpy[2].Y = rect->Y + rect->Height; + rectcpy[3].Y = rectcpy[2].Y = rect->Y + offsety + rect->Height; transform_and_round_points(graphics, corners, rectcpy, 4); if (roundr(rect->Width) == 0) @@ -3150,6 +3207,24 @@ *state = 0xdeadbeef; return Ok; +} + +GpStatus WINGDIPAPI GdipBeginContainer(GpGraphics *graphics, GDIPCONST GpRectF *dstrect, GDIPCONST GpRectF *srcrect, GpUnit unit, GraphicsContainer *state) +{ + FIXME("(%p, %p, %p, %d, %p): stub\n", graphics, dstrect, srcrect, unit, state); + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipBeginContainerI(GpGraphics *graphics, GDIPCONST GpRect *dstrect, GDIPCONST GpRect *srcrect, GpUnit unit, GraphicsContainer *state) +{ + FIXME("(%p, %p, %p, %d, %p): stub\n", graphics, dstrect, srcrect, unit, state); + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipComment(GpGraphics *graphics, UINT sizeData, GDIPCONST BYTE *data) +{ + FIXME("(%p, %d, %p): stub\n", graphics, sizeData, data); + return NotImplemented; } GpStatus WINGDIPAPI GdipEndContainer(GpGraphics *graphics, GraphicsState state) Modified: trunk/reactos/dll/win32/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] Sun Jun 7 11:59:56 2009 @@ -831,6 +831,18 @@ return status; } +GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT length, GDIPCONST GpFontFamily* family, INT style, REAL emSize, GDIPCONST RectF* layoutRect, GDIPCONST GpStringFormat* format) +{ + FIXME("(%p, %p, %d, %p, %d, %f, %p, %p): stub\n", path, string, length, family, style, emSize, layoutRect, format); + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipAddPathStringI(GpPath* path, GDIPCONST WCHAR* string, INT length, GDIPCONST GpFontFamily* family, INT style, REAL emSize, GDIPCONST Rect* layoutRect, GDIPCONST GpStringFormat* format) +{ + FIXME("(%p, %p, %d, %p, %d, %f, %p, %p): stub\n", path, string, length, family, style, emSize, layoutRect, format); + return NotImplemented; +} + GpStatus WINGDIPAPI GdipClonePath(GpPath* path, GpPath **clone) { TRACE("(%p, %p)\n", path, clone); Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] Sun Jun 7 11:59:56 2009 @@ -70,6 +70,29 @@ return x; } +GpStatus WINGDIPAPI GdipBitmapApplyEffect(GpBitmap* bitmap, CGpEffect* effect, + RECT* roi, BOOL useAuxData, VOID** auxData, INT* auxDataSize) +{ + FIXME("(%p %p %p %d %p %p): stub\n", bitmap, effect, roi, useAuxData, auxData, auxDataSize); + /* + * Note: According to Jose Roca's GDI+ docs, this function is not + * implemented in Windows's GDI+. + */ + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipBitmapCreateApplyEffect(GpBitmap** inputBitmaps, + INT numInputs, CGpEffect* effect, RECT* roi, RECT* outputRect, + GpBitmap** outputBitmap, BOOL useAuxData, VOID** auxData, INT* auxDataSize) +{ + FIXME("(%p %d %p %p %p %p %d %p %p): stub\n", inputBitmaps, numInputs, effect, roi, outputRect, outputBitmap, useAuxData, auxData, auxDataSize); + /* + * Note: According to Jose Roca's GDI+ docs, this function is not + * implemented in Windows's GDI+. + */ + return NotImplemented; +} + GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap* bitmap, INT x, INT y, ARGB *color) { @@ -271,10 +294,18 @@ return Ok; } +GpStatus WINGDIPAPI GdipCloneBitmapArea(REAL x, REAL y, REAL width, REAL height, + PixelFormat format, GpBitmap* srcBitmap, GpBitmap** dstBitmap) +{ + FIXME("(%f,%f,%f,%f,%i,%p,%p): stub\n", x, y, width, height, format, srcBitmap, dstBitmap); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipCloneBitmapAreaI(INT x, INT y, INT width, INT height, PixelFormat format, GpBitmap* srcBitmap, GpBitmap** dstBitmap) { - FIXME("(%i,%i,%i,%i,%i,%p,%p)\n", x, y, width, height, format, srcBitmap, dstBitmap); + FIXME("(%i,%i,%i,%i,%i,%p,%p): stub\n", x, y, width, height, format, srcBitmap, dstBitmap); return NotImplemented; } @@ -655,6 +686,13 @@ return Ok; } +GpStatus WINGDIPAPI GdipCreateHICONFromBitmap(GpBitmap *bitmap, HICON *hicon) +{ + FIXME("(%p, %p)\n", bitmap, hicon); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipDeleteCachedBitmap(GpCachedBitmap *cachedbmp) { TRACE("%p\n", cachedbmp); @@ -677,6 +715,13 @@ return InvalidParameter; return GdipDrawImage(graphics, cachedbmp->image, (REAL)x, (REAL)y); +} + +GpStatus WINGDIPAPI GdipEmfToWmfBits(HENHMETAFILE hemf, UINT cbData16, + LPBYTE pData16, INT iMapMode, INT eFlags) +{ + FIXME("(%p, %d, %p, %d, %d): stub\n", hemf, cbData16, pData16, iMapMode, eFlags); + return NotImplemented; } GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) @@ -1586,6 +1631,14 @@ return retval; } +GpStatus WINGDIPAPI GdipDeleteEffect(CGpEffect *effect) +{ + FIXME("(%p): stub\n", effect); + /* note: According to Jose Roca's GDI+ Docs, this is not implemented + * in Windows's gdiplus */ + return NotImplemented; +} + /***************************************************************************** * GdipSetEffectParameters [GDIPLUS.@] */

15 years, 5 months

[dchapyshev] 41317: - Sync comdlg32, avifil32 with Wine 1.1.23

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sun Jun 7 11:55:59 2009 New Revision: 41317 URL: http://svn.reactos.org/svn/reactos?rev=41317&view=rev Log: - Sync comdlg32, avifil32 with Wine 1.1.23 Modified: trunk/reactos/dll/win32/avifil32/avifile.c trunk/reactos/dll/win32/comdlg32/cdlg_De.rc Modified: trunk/reactos/dll/win32/avifil32/avifile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile.c [iso-8859-1] Sun Jun 7 11:55:59 2009 @@ -226,7 +226,7 @@ LONG lSkip); static void AVIFILE_UpdateInfo(IAVIFileImpl *This); static HRESULT AVIFILE_WriteBlock(IAVIStreamImpl *This, DWORD block, - FOURCC ckid, DWORD flags, LPVOID buffer, + FOURCC ckid, DWORD flags, LPCVOID buffer, LONG size); HRESULT AVIFILE_CreateAVIFile(REFIID riid, LPVOID *ppv) @@ -2543,7 +2543,7 @@ } static HRESULT AVIFILE_WriteBlock(IAVIStreamImpl *This, DWORD block, - FOURCC ckid, DWORD flags, LPVOID buffer, + FOURCC ckid, DWORD flags, LPCVOID buffer, LONG size) { MMCKINFO ck; Modified: trunk/reactos/dll/win32/comdlg32/cdlg_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_De… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg_De.rc [iso-8859-1] Sun Jun 7 11:55:59 2009 @@ -212,40 +212,40 @@ } -FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62 +FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 30, 73, 241, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Suchen" FONT 8, "MS Shell Dlg" { - LTEXT "S&uchen nach:", -1, 4, 8, 42, 8 - EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Nur ganze &Worte", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Beachte Groß/Kleinschreibung", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Richtung", 1072, 107, 26, 68, 28 - CONTROL "H&och", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 - CONTROL "&Runter", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 - DEFPUSHBUTTON "&Nächsten finden", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Abbrechen", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Hilfe", pshHelp, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP -} - - -REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94 + LTEXT "S&uchen nach:", -1, 4, 8, 45, 8 + EDITTEXT 1152, 53, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + CHECKBOX "Nu&r ganzes Wort suchen", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Groß-/Klein&schreibung", 1041, 4, 42, 84, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Suchrichtung", 1072, 113, 23, 68, 37 + CONTROL "Nach &oben", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 117, 34, 50, 10 + CONTROL "Nach &unten", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 117, 47, 50, 10 + DEFPUSHBUTTON "&Weitersuchen", IDOK, 187, 5, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Abbrechen", IDCANCEL, 187, 23, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Hilfe", pshHelp, 187, 45, 50, 14, WS_GROUP | WS_TABSTOP +} + + +REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 44, 240, 94 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ersetzen" FONT 8, "MS Shell Dlg" { - LTEXT "S&uchen nach:", -1, 4, 9, 48, 8 - EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "Ersetzen &durch:", -1, 4, 26, 48, 8 - EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Nur ganze &Worte", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Beachte Groß/Kleinschreibung", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP - DEFPUSHBUTTON "&Nächsten finden", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Ersetzen", psh1, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Alle ersetzen", psh2, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Abbrechen", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Hilfe", pshHelp, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP + LTEXT "&Suchen nach:", -1, 4, 9, 48, 8 + EDITTEXT 1152, 56, 7, 112, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "Ersetzen &durch:", -1, 4, 26, 52, 8 + EDITTEXT 1153, 56, 24, 112, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + CHECKBOX "Nu&r ganzes Wort", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Groß-/Kleins&chreibung", 1041, 5, 62, 86, 12, BS_AUTOCHECKBOX | WS_TABSTOP + DEFPUSHBUTTON "&Weitersuchen", IDOK, 175, 6, 60, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Ersetzen", psh1, 175, 23, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "A&lles ersetzen", psh2, 175, 40, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Abbrechen", IDCANCEL, 175, 57, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Hilfe", pshHelp, 175, 74, 60, 14, WS_GROUP | WS_TABSTOP } NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164

15 years, 5 months

[cwittich] 41316: sync riched20 and riched32 with wine 1.1.23

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jun 7 10:19:03 2009 New Revision: 41316 URL: http://svn.reactos.org/svn/reactos?rev=41316&view=rev Log: sync riched20 and riched32 with wine 1.1.23 Modified: trunk/reactos/dll/win32/riched20/caret.c trunk/reactos/dll/win32/riched20/clipboard.c trunk/reactos/dll/win32/riched20/editor.c trunk/reactos/dll/win32/riched20/editor.h trunk/reactos/dll/win32/riched20/reader.c trunk/reactos/dll/win32/riched20/rtf.h trunk/reactos/dll/win32/riched20/run.c trunk/reactos/dll/win32/riched32/richedit.c trunk/reactos/include/psdk/richedit.h Modified: trunk/reactos/dll/win32/riched20/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/caret.c… ============================================================================== --- trunk/reactos/dll/win32/riched20/caret.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/caret.c [iso-8859-1] Sun Jun 7 10:19:03 2009 @@ -168,7 +168,7 @@ } -void +static void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, int *x, int *y, int *height) { Modified: trunk/reactos/dll/win32/riched20/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/clipboa… ============================================================================== --- trunk/reactos/dll/win32/riched20/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/clipboard.c [iso-8859-1] Sun Jun 7 10:19:03 2009 @@ -282,6 +282,7 @@ if(dwDirection != DATADIR_GET) { FIXME("Unsupported direction: %d\n", dwDirection); /* WinXP riched20 also returns E_NOTIMPL in this case */ + *ppenumFormatEtc = NULL; return E_NOTIMPL; } return EnumFormatImpl_Create(This->fmtetc, This->fmtetc_cnt, ppenumFormatEtc); Modified: trunk/reactos/dll/win32/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… ============================================================================== --- trunk/reactos/dll/win32/riched20/editor.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editor.c [iso-8859-1] Sun Jun 7 10:19:03 2009 @@ -2901,7 +2901,7 @@ return ""; } -void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam) +static void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam) { int x,y; ME_DisplayItem *para, *run; @@ -4616,14 +4616,14 @@ return TRUE; } -LRESULT WINAPI REComboWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { +static LRESULT WINAPI REComboWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { /* FIXME: Not implemented */ TRACE("hWnd %p msg %04x (%s) %08lx %08lx\n", hWnd, msg, get_msg_name(msg), wParam, lParam); return DefWindowProcW(hWnd, msg, wParam, lParam); } -LRESULT WINAPI REListWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { +static LRESULT WINAPI REListWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { /* FIXME: Not implemented */ TRACE("hWnd %p msg %04x (%s) %08lx %08lx\n", hWnd, msg, get_msg_name(msg), wParam, lParam); Modified: trunk/reactos/dll/win32/riched20/editor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… ============================================================================== --- trunk/reactos/dll/win32/riched20/editor.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editor.h [iso-8859-1] Sun Jun 7 10:19:03 2009 @@ -171,9 +171,6 @@ 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); Modified: trunk/reactos/dll/win32/riched20/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/reader.… ============================================================================== --- trunk/reactos/dll/win32/riched20/reader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/reader.c [iso-8859-1] Sun Jun 7 10:19:03 2009 @@ -226,10 +226,6 @@ 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++) @@ -276,39 +272,6 @@ info->canInheritInTbl = FALSE; info->borderType = 0; } - -/* - * 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 @@ -480,14 +443,6 @@ * twice due to the RTFUngetToken. */ if(RTFCheckCM (info, rtfGroup, rtfEndGroup)) info->stackTop++; -} - - -int RTFPeekToken(RTF_Info *info) -{ - _RTFGetToken (info); - RTFUngetToken (info); - return (info->rtfClass); } @@ -792,29 +747,6 @@ } info->prevChar = c; return (c); -} - - -/* - * Synthesize a token by setting the global variables to the - * values supplied. Typically this is followed with a call - * to RTFRouteToken(). - * - * If a param value other than rtfNoParam is passed, it becomes - * part of the token text. - */ - -static void RTFSetToken(RTF_Info *info, int class, int major, int minor, int param, const char *text) -{ - info->rtfClass = class; - info->rtfMajor = major; - info->rtfMinor = minor; - info->rtfParam = param; - if (param == rtfNoParam) - lstrcpyA(info->rtfTextBuf, text); - else - sprintf (info->rtfTextBuf, "%s%d", text, param); - info->rtfTextLen = lstrlenA (info->rtfTextBuf); } @@ -1281,22 +1213,6 @@ * References to style 0 are mapped onto the Normal style. */ - -static RTFStyle *RTFGetStyle(const RTF_Info *info, int num) -{ - RTFStyle *s; - - if (num == -1) - return (info->styleList); - for (s = info->styleList; s != NULL; s = s->rtfNextStyle) - { - if (s->rtfSNum == num) - break; - } - return (s); /* NULL if not found */ -} - - RTFFont *RTFGetFont(const RTF_Info *info, int num) { RTFFont *f; @@ -1324,59 +1240,6 @@ break; } return (c); /* NULL if not found */ -} - - -/* ---------------------------------------------------------------------- */ - - -/* - * Expand style n, if there is such a style. - */ - -void RTFExpandStyle(RTF_Info *info, int n) -{ - RTFStyle *s; - RTFStyleElt *se; - - if (n == -1) - return; - s = RTFGetStyle (info, n); - if (s == NULL) - return; - if (s->rtfExpanding != 0) - ERR ("Style expansion loop, style %d\n", n); - s->rtfExpanding = 1; /* set expansion flag for loop detection */ - /* - * Expand "based-on" style (unless it's the same as the current - * style -- Normal style usually gives itself as its own based-on - * style). Based-on style expansion is done by synthesizing - * the token that the writer needs to see in order to trigger - * another style expansion, and feeding to token back through - * the router so the writer sees it. - */ - if (n != s->rtfSBasedOn) - { - RTFSetToken (info, rtfControl, rtfParAttr, rtfStyleNum, - s->rtfSBasedOn, "\\s"); - RTFRouteToken (info); - } - /* - * Now route the tokens unique to this style. RTFSetToken() - * isn't used because it would add the param value to the end - * of the token text, which already has it in. - */ - for (se = s->rtfSSEList; se != NULL; se = se->rtfNextSE) - { - info->rtfClass = se->rtfSEClass; - info->rtfMajor = se->rtfSEMajor; - info->rtfMinor = se->rtfSEMinor; - info->rtfParam = se->rtfSEParam; - lstrcpyA (info->rtfTextBuf, se->rtfSEText); - info->rtfTextLen = lstrlenA (info->rtfTextBuf); - RTFRouteToken (info); - } - s->rtfExpanding = 0; /* done - clear expansion flag */ } @@ -2434,14 +2297,6 @@ } -int RTFHexToChar(int i) -{ - if (i < 10) - return (i + '0'); - return (i - 10 + 'a'); -} - - /* ---------------------------------------------------------------------- */ /* Modified: trunk/reactos/dll/win32/riched20/rtf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/rtf.h?r… ============================================================================== --- trunk/reactos/dll/win32/riched20/rtf.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/rtf.h [iso-8859-1] Sun Jun 7 10:19:03 2009 @@ -1152,9 +1152,6 @@ 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,26 +1188,19 @@ 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 */ -int RTFPeekToken (RTF_Info *); void RTFSetReadHook (RTF_Info *, RTFFuncPtr); void RTFRouteToken (RTF_Info *); void RTFSkipGroup (RTF_Info *); void RTFReadGroup (RTF_Info *); -void RTFExpandStyle (RTF_Info *, int); int RTFCheckCM (const RTF_Info *, int, int); int RTFCheckCMM (const RTF_Info *, int, int, int); int RTFCheckMM (const RTF_Info *, int, int); RTFFont *RTFGetFont (const RTF_Info *, int); RTFColor *RTFGetColor (const RTF_Info *, int); int RTFCharToHex ( char); -int RTFHexToChar ( int ); void RTFFlushOutputBuffer( RTF_Info *info ); void RTFSetEditStream(RTF_Info *info, ME_InStream *stream); Modified: trunk/reactos/dll/win32/riched20/run.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/run.c?r… ============================================================================== --- trunk/reactos/dll/win32/riched20/run.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/run.c [iso-8859-1] Sun Jun 7 10:19:03 2009 @@ -725,18 +725,6 @@ } /****************************************************************************** - * 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 Modified: trunk/reactos/dll/win32/riched32/richedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched32/richedi… ============================================================================== --- trunk/reactos/dll/win32/riched32/richedit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched32/richedit.c [iso-8859-1] Sun Jun 7 10:19:03 2009 @@ -59,7 +59,7 @@ wndClass.style = CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS; wndClass.lpfnWndProc = RichEdit10ANSIWndProc; wndClass.cbClsExtra = 0; - wndClass.cbWndExtra = 4; + wndClass.cbWndExtra = sizeof(void *); wndClass.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW); wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wndClass.lpszClassName = RICHEDIT_CLASS10A; /* WC_RICHED32A; */ Modified: trunk/reactos/include/psdk/richedit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/richedit.h?re… ============================================================================== --- trunk/reactos/include/psdk/richedit.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/richedit.h [iso-8859-1] Sun Jun 7 10:19:03 2009 @@ -517,7 +517,7 @@ typedef struct _editstream { DWORD_PTR dwCookie; - DWORD_PTR dwError; + DWORD dwError; EDITSTREAMCALLBACK pfnCallback; } EDITSTREAM;

15 years, 5 months

← Newer
1
...
38
39
40
41
42
43
44
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2009