Ros-diffs October 2009

ros-diffs@reactos.org

26 participants
641 discussions

[cwittich] 43740: -sync cabinet with wine 1.1.32
by cwittich＠svn.reactos.org 25 Oct '09

25 Oct '09

Author: cwittich Date: Sun Oct 25 14:45:15 2009 New Revision: 43740 URL: http://svn.reactos.org/svn/reactos?rev=43740&view=rev Log: -sync cabinet with wine 1.1.32 Modified: trunk/reactos/dll/win32/cabinet/fdi.c Modified: trunk/reactos/dll/win32/cabinet/fdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fdi.c?re… ============================================================================== --- trunk/reactos/dll/win32/cabinet/fdi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/fdi.c [iso-8859-1] Sun Oct 25 14:45:15 2009 @@ -2279,9 +2279,10 @@ } } -static void free_decompression_mem(HFDI hfdi, struct fdi_folder *fol, +static void free_decompression_mem(HFDI hfdi, fdi_decomp_state *decomp_state, struct fdi_file *file) { + struct fdi_folder *fol; while (decomp_state) { fdi_decomp_state *prev_fds; @@ -2896,17 +2897,17 @@ } free_decompression_temps(hfdi, fol, decomp_state); - free_decompression_mem(hfdi, fol, decomp_state, file); + free_decompression_mem(hfdi, decomp_state, file); return TRUE; bail_and_fail: /* here we free ram before error returns */ - free_decompression_temps(hfdi, fol, decomp_state); + if (fol) free_decompression_temps(hfdi, fol, decomp_state); if (filehf) PFDI_CLOSE(hfdi, filehf); - free_decompression_mem(hfdi, fol, decomp_state, file); + free_decompression_mem(hfdi, decomp_state, file); return FALSE; }

1 0

[tkreuzer] 43739: [KDCOM] - Compare checksum after retreiving the full packet - simplify code
by tkreuzer＠svn.reactos.org 25 Oct '09

25 Oct '09

Author: tkreuzer Date: Sun Oct 25 12:55:04 2009 New Revision: 43739 URL: http://svn.reactos.org/svn/reactos?rev=43739&view=rev Log: [KDCOM] - Compare checksum after retreiving the full packet - simplify code Modified: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c Modified: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c [iso-8859-1] Sun Oct 25 12:55:04 2009 @@ -307,6 +307,15 @@ } } + /* We must receive a PACKET_TRAILING_BYTE now */ + KdStatus = KdpReceiveBuffer(&Byte, sizeof(UCHAR)); + if (KdStatus != KDP_PACKET_RECEIVED || Byte != PACKET_TRAILING_BYTE) + { + KDDBGPRINT("KdReceivePacket - wrong trailing byte (0x%x), status 0x%x\n", Byte, KdStatus); + KdpSendControlPacket(PACKET_TYPE_KD_RESEND, 0); + continue; + } + /* Compare checksum */ if (Packet.Checksum != Checksum) { @@ -316,30 +325,19 @@ continue; } - /* We must receive a PACKET_TRAILING_BYTE now */ - KdStatus = KdpReceiveBuffer(&Byte, sizeof(UCHAR)); - if (KdStatus != KDP_PACKET_RECEIVED || Byte != PACKET_TRAILING_BYTE) - { - KDDBGPRINT("KdReceivePacket - wrong trailing byte (0x%x), status 0x%x\n", Byte, KdStatus); - KdpSendControlPacket(PACKET_TYPE_KD_RESEND, 0); - continue; - } - - /* Did we get the right packet type? */ - if (PacketType != Packet.PacketType) - { - /* We received something different, ignore it. */ - KDDBGPRINT("KdReceivePacket - wrong PacketType\n"); - KdpSendControlPacket(PACKET_TYPE_KD_ACKNOWLEDGE, Packet.PacketId); - continue; - } - /* Acknowledge the received packet */ KdpSendControlPacket(PACKET_TYPE_KD_ACKNOWLEDGE, Packet.PacketId); - //KDDBGPRINT("KdReceivePacket - all ok\n"); - - return KDP_PACKET_RECEIVED; + /* Did we get the right packet type? */ + if (PacketType == Packet.PacketType) + { + /* Yes, return success */ + //KDDBGPRINT("KdReceivePacket - all ok\n"); + return KDP_PACKET_RECEIVED; + } + + /* We received something different, ignore it. */ + KDDBGPRINT("KdReceivePacket - wrong PacketType\n"); } return KDP_PACKET_RECEIVED;

1 0

[tkreuzer] 43738: [KDCOM] - Check the PacketType only after the whole message was received and just skip the message and restart when it's not what we wanted.
by tkreuzer＠svn.reactos.org 25 Oct '09

25 Oct '09

Author: tkreuzer Date: Sun Oct 25 12:37:17 2009 New Revision: 43738 URL: http://svn.reactos.org/svn/reactos?rev=43738&view=rev Log: [KDCOM] - Check the PacketType only after the whole message was received and just skip the message and restart when it's not what we wanted. Modified: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c Modified: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c [iso-8859-1] Sun Oct 25 12:37:17 2009 @@ -227,15 +227,6 @@ return KDP_PACKET_RECEIVED; } - /* Did we get the right packet type? */ - if (PacketType != Packet.PacketType) - { - /* We received something different, start over */ - KDDBGPRINT("KdReceivePacket - wrong PacketType\n"); - KdpSendControlPacket(PACKET_TYPE_KD_RESEND, 0); - continue; - } - /* Get size of the message header */ switch (Packet.PacketType) { @@ -334,6 +325,15 @@ continue; } + /* Did we get the right packet type? */ + if (PacketType != Packet.PacketType) + { + /* We received something different, ignore it. */ + KDDBGPRINT("KdReceivePacket - wrong PacketType\n"); + KdpSendControlPacket(PACKET_TYPE_KD_ACKNOWLEDGE, Packet.PacketId); + continue; + } + /* Acknowledge the received packet */ KdpSendControlPacket(PACKET_TYPE_KD_ACKNOWLEDGE, Packet.PacketId);

1 0

[cwittich] 43737: don't crash in msi install winetest
by cwittich＠svn.reactos.org 25 Oct '09

25 Oct '09

Author: cwittich Date: Sun Oct 25 12:14:03 2009 New Revision: 43737 URL: http://svn.reactos.org/svn/reactos?rev=43737&view=rev Log: don't crash in msi install winetest Modified: trunk/reactos/dll/win32/shell32/shelllink.c Modified: trunk/reactos/dll/win32/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelllink.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelllink.c [iso-8859-1] Sun Oct 25 12:14:03 2009 @@ -2168,6 +2168,8 @@ UINT len; TRACE("(%p)->(path=%s)\n",This, debugstr_w(pszFile)); + + if (!pszFile) return E_INVALIDARG; /* quotes at the ends of the string are stripped */ len = wcslen(pszFile);

1 0

[cwittich] 43736: -sync msi_winetest with wine 1.1.32
by cwittich＠svn.reactos.org 25 Oct '09

25 Oct '09

Author: cwittich Date: Sun Oct 25 12:06:38 2009 New Revision: 43736 URL: http://svn.reactos.org/svn/reactos?rev=43736&view=rev Log: -sync msi_winetest with wine 1.1.32 Modified: trunk/rostests/winetests/msi/db.c trunk/rostests/winetests/msi/package.c Modified: trunk/rostests/winetests/msi/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/db.c?rev=43… ============================================================================== --- trunk/rostests/winetests/msi/db.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/db.c [iso-8859-1] Sun Oct 25 12:06:38 2009 @@ -4449,6 +4449,142 @@ DeleteFile(msifile); } +static void test_rows_order(void) +{ + const char *query; + MSIHANDLE hdb = 0, hview = 0, hrec = 0; + UINT r; + char buffer[100]; + DWORD sz; + + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "MsiOpenDatabase failed\n"); + + query = "CREATE TABLE `foo` ( " + "`bar` LONGCHAR NOT NULL PRIMARY KEY `bar`)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "failed to create table\n"); + + r = run_query(hdb, 0, "INSERT INTO `foo` " + "( `bar` ) VALUES ( 'A' )"); + ok(r == ERROR_SUCCESS, "cannot add value to table\n"); + + r = run_query(hdb, 0, "INSERT INTO `foo` " + "( `bar` ) VALUES ( 'B' )"); + ok(r == ERROR_SUCCESS, "cannot add value to table\n"); + + r = run_query(hdb, 0, "INSERT INTO `foo` " + "( `bar` ) VALUES ( 'C' )"); + ok(r == ERROR_SUCCESS, "cannot add value to table\n"); + + r = run_query(hdb, 0, "INSERT INTO `foo` " + "( `bar` ) VALUES ( 'D' )"); + ok(r == ERROR_SUCCESS, "cannot add value to table\n"); + + r = run_query(hdb, 0, "INSERT INTO `foo` " + "( `bar` ) VALUES ( 'E' )"); + ok(r == ERROR_SUCCESS, "cannot add value to table\n"); + + r = run_query(hdb, 0, "INSERT INTO `foo` " + "( `bar` ) VALUES ( 'F' )"); + ok(r == ERROR_SUCCESS, "cannot add value to table\n"); + + query = "CREATE TABLE `bar` ( " + "`foo` LONGCHAR NOT NULL, " + "`baz` LONGCHAR NOT NULL " + "PRIMARY KEY `foo` )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "failed to create table\n"); + + r = run_query(hdb, 0, "INSERT INTO `bar` " + "( `foo`, `baz` ) VALUES ( 'C', 'E' )"); + ok(r == ERROR_SUCCESS, "cannot add value to table\n"); + + r = run_query(hdb, 0, "INSERT INTO `bar` " + "( `foo`, `baz` ) VALUES ( 'F', 'A' )"); + ok(r == ERROR_SUCCESS, "cannot add value to table\n"); + + r = run_query(hdb, 0, "INSERT INTO `bar` " + "( `foo`, `baz` ) VALUES ( 'A', 'B' )"); + ok(r == ERROR_SUCCESS, "cannot add value to table\n"); + + r = run_query(hdb, 0, "INSERT INTO `bar` " + "( `foo`, `baz` ) VALUES ( 'D', 'E' )"); + ok(r == ERROR_SUCCESS, "cannot add value to table\n"); + + /* The rows of the table must be ordered by the column values of + each row. For strings, the column value is the string id + in the string table. */ + + query = "SELECT * FROM `bar`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 1, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buffer, "A"), "Expected A, got %s\n", buffer); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 2, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buffer, "B"), "Expected B, got %s\n", buffer); + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 1, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buffer, "C"), "Expected E, got %s\n", buffer); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 2, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buffer, "E"), "Expected E, got %s\n", buffer); + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 1, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buffer, "D"), "Expected D, got %s\n", buffer); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 2, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buffer, "E"), "Expected E, got %s\n", buffer); + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 1, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buffer, "F"), "Expected F, got %s\n", buffer); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 2, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buffer, "A"), "Expected A, got %s\n", buffer); + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + r = MsiCloseHandle(hdb); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + DeleteFile(msifile); +} + static void test_select_markers(void) { MSIHANDLE hdb = 0, rec, view, res; @@ -7109,6 +7245,51 @@ r = run_query(href, 0, query); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + query = "CREATE TABLE `One` ( " + "`A` CHAR(72), " + "`B` CHAR(56), " + "`C` CHAR(64) LOCALIZABLE, " + "`D` LONGCHAR, " + "`E` CHAR(72) NOT NULL, " + "`F` CHAR(56) NOT NULL, " + "`G` CHAR(64) NOT NULL LOCALIZABLE, " + "`H` LONGCHAR NOT NULL " + "PRIMARY KEY `A` )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "CREATE TABLE `One` ( " + "`A` CHAR(64), " + "`B` CHAR(64), " + "`C` CHAR(64), " + "`D` CHAR(64), " + "`E` CHAR(64) NOT NULL, " + "`F` CHAR(64) NOT NULL, " + "`G` CHAR(64) NOT NULL, " + "`H` CHAR(64) NOT NULL " + "PRIMARY KEY `A` )"; + r = run_query(href, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* column sting types don't match exactly */ + r = MsiDatabaseMergeA(hdb, href, "MergeErrors"); + ok(r == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got %d\n", r); + + /* nothing in MergeErrors */ + query = "SELECT * FROM `MergeErrors`"; + r = do_query(hdb, query, &hrec); + ok(r == ERROR_BAD_QUERY_SYNTAX, + "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + + query = "DROP TABLE `One`"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "DROP TABLE `One`"; + r = run_query(href, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + query = "CREATE TABLE `One` ( `A` INT, `B` INT PRIMARY KEY `A` )"; r = run_query(hdb, 0, query); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -7552,6 +7733,70 @@ r = do_query(hdb, query, &hrec); ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + + query = "DROP TABLE `One`"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "DROP TABLE `One`"; + r = run_query(href, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "CREATE TABLE `One` ( `A` INT, `B` CHAR(72) PRIMARY KEY `A` )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = run_query(href, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `One` ( `A`, `B` ) VALUES ( 1, 'foo' )"; + r = run_query(href, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `One` ( `A`, `B` ) VALUES ( 2, 'bar' )"; + r = run_query(href, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiDatabaseMergeA(hdb, href, "MergeErrors"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "SELECT * FROM `One`"; + r = MsiDatabaseOpenViewA(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiRecordGetInteger(hrec, 1); + ok(r == 1, "Expected 1, got %d\n", r); + + size = MAX_PATH; + r = MsiRecordGetStringA(hrec, 2, buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, "foo"), "Expected \"foo\", got \"%s\"\n", buf); + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiRecordGetInteger(hrec, 1); + ok(r == 2, "Expected 2, got %d\n", r); + + size = MAX_PATH; + r = MsiRecordGetStringA(hrec, 2, buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, "bar"), "Expected \"bar\", got \"%s\"\n", buf); + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, + "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + MsiViewClose(hview); + MsiCloseHandle(hview); MsiCloseHandle(hdb); MsiCloseHandle(href); @@ -8218,6 +8463,7 @@ test_update(); test_special_tables(); test_tables_order(); + test_rows_order(); test_select_markers(); test_viewmodify_update(); test_viewmodify_assign(); Modified: trunk/rostests/winetests/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/package.c?r… ============================================================================== --- trunk/rostests/winetests/msi/package.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/package.c [iso-8859-1] Sun Oct 25 12:06:38 2009 @@ -843,7 +843,10 @@ static void test_gettargetpath_bad(void) { + static const WCHAR boo[] = {'b','o','o',0}; + static const WCHAR empty[] = {0}; char buffer[0x80]; + WCHAR bufferW[0x80]; MSIHANDLE hpkg; DWORD sz; UINT r; @@ -867,6 +870,32 @@ ok( r == ERROR_DIRECTORY, "wrong return val\n"); r = MsiGetTargetPath( hpkg, "boo", buffer, NULL ); + ok( r == ERROR_DIRECTORY, "wrong return val\n"); + + sz = 0; + r = MsiGetTargetPath( hpkg, "", buffer, &sz ); + ok( r == ERROR_DIRECTORY, "wrong return val\n"); + + r = MsiGetTargetPathW( 0, NULL, NULL, NULL ); + ok( r == ERROR_INVALID_PARAMETER, "wrong return val\n"); + + r = MsiGetTargetPathW( 0, NULL, NULL, &sz ); + ok( r == ERROR_INVALID_PARAMETER, "wrong return val\n"); + + r = MsiGetTargetPathW( 0, boo, NULL, NULL ); + ok( r == ERROR_INVALID_HANDLE, "wrong return val\n"); + + r = MsiGetTargetPathW( 0, boo, NULL, NULL ); + ok( r == ERROR_INVALID_HANDLE, "wrong return val\n"); + + r = MsiGetTargetPathW( hpkg, boo, NULL, NULL ); + ok( r == ERROR_DIRECTORY, "wrong return val\n"); + + r = MsiGetTargetPathW( hpkg, boo, bufferW, NULL ); + ok( r == ERROR_DIRECTORY, "wrong return val\n"); + + sz = 0; + r = MsiGetTargetPathW( hpkg, empty, bufferW, &sz ); ok( r == ERROR_DIRECTORY, "wrong return val\n"); MsiCloseHandle( hpkg ); @@ -7662,6 +7691,7 @@ DeleteFileA("FileName10.dll"); MsiCloseHandle(hpkg); DeleteFileA(msifile); + LocalFree(usersid); } static void test_appsearch_reglocator(void) @@ -11362,6 +11392,7 @@ ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); } + buffer[0] = 0; size = MAX_PATH; r = MsiRecordGetString(hrec, 1, buffer, &size); todo_wine

1 0

[cwittich] 43735: -sync msi with wine 1.1.32
by cwittich＠svn.reactos.org 25 Oct '09

25 Oct '09

Author: cwittich Date: Sun Oct 25 12:06:09 2009 New Revision: 43735 URL: http://svn.reactos.org/svn/reactos?rev=43735&view=rev Log: -sync msi with wine 1.1.32 Modified: trunk/reactos/dll/win32/msi/action.c trunk/reactos/dll/win32/msi/appsearch.c trunk/reactos/dll/win32/msi/classes.c trunk/reactos/dll/win32/msi/cond.tab.c trunk/reactos/dll/win32/msi/cond.tab.h trunk/reactos/dll/win32/msi/cond.y trunk/reactos/dll/win32/msi/custom.c trunk/reactos/dll/win32/msi/database.c trunk/reactos/dll/win32/msi/dialog.c trunk/reactos/dll/win32/msi/events.c trunk/reactos/dll/win32/msi/files.c trunk/reactos/dll/win32/msi/helpers.c trunk/reactos/dll/win32/msi/media.c trunk/reactos/dll/win32/msi/msi.c trunk/reactos/dll/win32/msi/msi_De.rc trunk/reactos/dll/win32/msi/msipriv.h trunk/reactos/dll/win32/msi/msiquery.c trunk/reactos/dll/win32/msi/package.c trunk/reactos/dll/win32/msi/preview.c trunk/reactos/dll/win32/msi/registry.c trunk/reactos/dll/win32/msi/source.c trunk/reactos/dll/win32/msi/string.c trunk/reactos/dll/win32/msi/suminfo.c trunk/reactos/dll/win32/msi/table.c trunk/reactos/dll/win32/msi/upgrade.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… Modified: trunk/reactos/dll/win32/msi/appsearch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/appsearch.c?… Modified: trunk/reactos/dll/win32/msi/classes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/classes.c?re… Modified: trunk/reactos/dll/win32/msi/cond.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/cond.tab.c?r… Modified: trunk/reactos/dll/win32/msi/cond.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/cond.tab.h?r… Modified: trunk/reactos/dll/win32/msi/cond.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/cond.y?rev=4… Modified: trunk/reactos/dll/win32/msi/custom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/custom.c?rev… Modified: trunk/reactos/dll/win32/msi/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/database.c?r… Modified: trunk/reactos/dll/win32/msi/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/dialog.c?rev… Modified: trunk/reactos/dll/win32/msi/events.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/events.c?rev… Modified: trunk/reactos/dll/win32/msi/files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/files.c?rev=… Modified: trunk/reactos/dll/win32/msi/helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/helpers.c?re… Modified: trunk/reactos/dll/win32/msi/media.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/media.c?rev=… Modified: trunk/reactos/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.c?rev=43… Modified: trunk/reactos/dll/win32/msi/msi_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_De.rc?re… Modified: trunk/reactos/dll/win32/msi/msipriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msipriv.h?re… Modified: trunk/reactos/dll/win32/msi/msiquery.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiquery.c?r… Modified: trunk/reactos/dll/win32/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/package.c?re… Modified: trunk/reactos/dll/win32/msi/preview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/preview.c?re… Modified: trunk/reactos/dll/win32/msi/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/registry.c?r… Modified: trunk/reactos/dll/win32/msi/source.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/source.c?rev… Modified: trunk/reactos/dll/win32/msi/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/string.c?rev… Modified: trunk/reactos/dll/win32/msi/suminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/suminfo.c?re… Modified: trunk/reactos/dll/win32/msi/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/table.c?rev=… Modified: trunk/reactos/dll/win32/msi/upgrade.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/upgrade.c?re…

1 0

[gadamopoulos] 43734: Sync DrawText funtions with wine 1.1.32 Fixes all user32 text tests
by gadamopoulos＠svn.reactos.org 25 Oct '09

25 Oct '09

Author: gadamopoulos Date: Sun Oct 25 10:32:01 2009 New Revision: 43734 URL: http://svn.reactos.org/svn/reactos?rev=43734&view=rev Log: Sync DrawText funtions with wine 1.1.32 Fixes all user32 text tests Modified: trunk/reactos/dll/win32/user32/windows/font.c Modified: trunk/reactos/dll/win32/user32/windows/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/f… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/font.c [iso-8859-1] Sun Oct 25 10:32:01 2009 @@ -31,6 +31,8 @@ #include <user32.h> #include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(text); /* FUNCTIONS *****************************************************************/ @@ -343,7 +345,7 @@ unsigned int len_ellipsis; unsigned int lo, mid, hi; - len_ellipsis = wcslen (ELLIPSISW); + len_ellipsis = strlenW (ELLIPSISW); if (len_ellipsis > max_len) len_ellipsis = max_len; if (*len_str > max_len - len_ellipsis) *len_str = max_len - len_ellipsis; @@ -368,7 +370,7 @@ /* Now this should take only a couple iterations at most. */ for ( ; ; ) { - wcsncpy (str + *len_str, ELLIPSISW, len_ellipsis); + memcpy(str + *len_str, ELLIPSISW, len_ellipsis*sizeof(WCHAR)); if (!GetTextExtentExPointW (hdc, str, *len_str + len_ellipsis, width, NULL, NULL, size)) break; @@ -383,8 +385,8 @@ if (modstr) { - wcsncpy (modstr, str, *len_str); - *(str+*len_str) = '\0'; + memcpy (modstr, str, *len_str * sizeof(WCHAR)); + modstr[*len_str] = '\0'; } } @@ -435,12 +437,12 @@ unsigned int *len_str, int width, SIZE *size, WCHAR *modstr, ellipsis_data *pellip) { - unsigned int len_ellipsis; + int len_ellipsis; int len_trailing; int len_under; WCHAR *lastBkSlash, *lastFwdSlash, *lastSlash; - len_ellipsis = wcslen (ELLIPSISW); + len_ellipsis = strlenW (ELLIPSISW); if (!max_len) return; if (len_ellipsis >= max_len) len_ellipsis = max_len - 1; if (*len_str + len_ellipsis >= max_len) @@ -450,15 +452,15 @@ */ str[*len_str] = '\0'; /* to simplify things */ - lastBkSlash = wcsrchr (str, BACK_SLASH); - lastFwdSlash = wcsrchr (str, FORWARD_SLASH); + lastBkSlash = strrchrW (str, BACK_SLASH); + lastFwdSlash = strrchrW (str, FORWARD_SLASH); lastSlash = lastBkSlash > lastFwdSlash ? lastBkSlash : lastFwdSlash; if (!lastSlash) lastSlash = str; len_trailing = *len_str - (lastSlash - str); /* overlap-safe movement to the right */ memmove (lastSlash+len_ellipsis, lastSlash, len_trailing * sizeof(WCHAR)); - wcsncpy (lastSlash, ELLIPSISW, len_ellipsis); + memcpy (lastSlash, ELLIPSISW, len_ellipsis*sizeof(WCHAR)); len_trailing += len_ellipsis; /* From this point on lastSlash actually points to the ellipsis in front * of the last slash and len_trailing includes the ellipsis @@ -488,8 +490,8 @@ if (modstr) { - wcsncpy (modstr, str, *len_str); - *(str+*len_str) = '\0'; + memcpy(modstr, str, *len_str * sizeof(WCHAR)); + modstr[*len_str] = '\0'; } } @@ -999,7 +1001,7 @@ * offset [in] The offset of the underscored character within str * rect [in] Clipping rectangle (if not NULL) */ -/* WINE synced 22-May-2006 */ +/* Synced with wine 1.1.32 */ static void TEXT_DrawUnderscore (HDC hdc, int x, int y, const WCHAR *str, int offset, const RECT *rect) { int prefix_x; @@ -1044,13 +1046,13 @@ * the allowance in DrawTextExA. */ #define MAX_BUFFER 1024 -/* WINE synced 22-May-2006 */ -/* +/* * @implemented - */ -int WINAPI -DrawTextExW( HDC hdc, LPWSTR str, INT i_count, - LPRECT rect, UINT flags, LPDRAWTEXTPARAMS dtp ) + * + * Synced with wine 1.1.32 + */ +INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, + LPRECT rect, UINT flags, LPDRAWTEXTPARAMS dtp ) { SIZE size; const WCHAR *strPtr; @@ -1067,16 +1069,33 @@ int tabwidth /* to keep gcc happy */ = 0; int prefix_offset; ellipsis_data ellip; - -#if 0 + int invert_y=0; + TRACE("%s, %d, [%s] %08x\n", debugstr_wn (str, count), count, wine_dbgstr_rect(rect), flags); if (dtp) TRACE("Params: iTabLength=%d, iLeftMargin=%d, iRightMargin=%d\n", dtp->iTabLength, dtp->iLeftMargin, dtp->iRightMargin); -#endif - - if (!str || count == 0) return 0; + + if (!str) return 0; + + strPtr = str; + + if (flags & DT_SINGLELINE) + flags &= ~DT_WORDBREAK; + + GetTextMetricsW(hdc, &tm); + if (flags & DT_EXTERNALLEADING) + lh = tm.tmHeight + tm.tmExternalLeading; + else + lh = tm.tmHeight; + + if (str[0] && count == 0) + return lh; + + if (dtp && dtp->cbSize != sizeof(DRAWTEXTPARAMS)) + return 0; + if (count == -1) { count = strlenW(str); @@ -1085,26 +1104,28 @@ if( flags & DT_CALCRECT) { rect->right = rect->left; - rect->bottom = rect->top; + if( flags & DT_SINGLELINE) + rect->bottom = rect->top + lh; + else + rect->bottom = rect->top; } - return 0; - } - } - strPtr = str; - - if (flags & DT_SINGLELINE) - flags &= ~DT_WORDBREAK; - - GetTextMetricsW(hdc, &tm); - if (flags & DT_EXTERNALLEADING) - lh = tm.tmHeight + tm.tmExternalLeading; - else - lh = tm.tmHeight; + return lh; + } + } + + if (GetGraphicsMode(hdc) == GM_COMPATIBLE) + { + SIZE window_ext, viewport_ext; + GetWindowExtEx(hdc, &window_ext); + GetViewportExtEx(hdc, &viewport_ext); + if ((window_ext.cy > 0) != (viewport_ext.cy > 0)) + invert_y = 1; + } if (dtp) { - lmargin = dtp->iLeftMargin * tm.tmAveCharWidth; - rmargin = dtp->iRightMargin * tm.tmAveCharWidth; + lmargin = dtp->iLeftMargin; + rmargin = dtp->iRightMargin; if (!(flags & (DT_CENTER | DT_RIGHT))) x += lmargin; dtp->uiLengthDrawn = 0; /* This param RECEIVES number of chars processed */ @@ -1113,7 +1134,7 @@ if (flags & DT_EXPANDTABS) { int tabstop = ((flags & DT_TABSTOP) && dtp) ? dtp->iTabLength : 8; - tabwidth = tm.tmAveCharWidth * tabstop; + tabwidth = tm.tmAveCharWidth * tabstop; } if (flags & DT_CALCRECT) flags |= DT_NOCLIP; @@ -1134,23 +1155,26 @@ do { - len = sizeof(line)/sizeof(line[0]); - last_line = !(flags & DT_NOCLIP) && y + ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) > rect->bottom; - strPtr = TEXT_NextLineW(hdc, strPtr, &count, line, &len, width, flags, &size, last_line, &p_retstr, tabwidth, &prefix_offset, &ellip); - - if (flags & DT_CENTER) - x = (rect->left + rect->right - size.cx) / 2; - else if (flags & DT_RIGHT) x = rect->right - size.cx; - - if (flags & DT_SINGLELINE) - { - if (flags & DT_VCENTER) y = rect->top + - (rect->bottom - rect->top) / 2 - size.cy / 2; - else if (flags & DT_BOTTOM) y = rect->bottom - size.cy; - } - - if (!(flags & DT_CALCRECT)) - { + len = sizeof(line)/sizeof(line[0]); + if (invert_y) + last_line = !(flags & DT_NOCLIP) && y - ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) < rect->bottom; + else + last_line = !(flags & DT_NOCLIP) && y + ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) > rect->bottom; + strPtr = TEXT_NextLineW(hdc, strPtr, &count, line, &len, width, flags, &size, last_line, &p_retstr, tabwidth, &prefix_offset, &ellip); + + if (flags & DT_CENTER) x = (rect->left + rect->right - + size.cx) / 2; + else if (flags & DT_RIGHT) x = rect->right - size.cx; + + if (flags & DT_SINGLELINE) + { + if (flags & DT_VCENTER) y = rect->top + + (rect->bottom - rect->top) / 2 - size.cy / 2; + else if (flags & DT_BOTTOM) y = rect->bottom - size.cy; + } + + if (!(flags & DT_CALCRECT)) + { const WCHAR *str = line; int xseg = x; while (len) @@ -1168,12 +1192,11 @@ else len_seg = len; - if (!(flags & DT_PREFIXONLY)&& - !ExtTextOutW( hdc, xseg, y, + if (!ExtTextOutW( hdc, xseg, y, ((flags & DT_NOCLIP) ? 0 : ETO_CLIPPED) | ((flags & DT_RTLREADING) ? ETO_RTLREADING : 0), rect, str, len_seg, NULL )) return 0; - if (prefix_offset != -1 && prefix_offset < len_seg && !(flags & DT_HIDEPREFIX)) + if (prefix_offset != -1 && prefix_offset < len_seg) { TEXT_DrawUnderscore (hdc, xseg, y + tm.tmAscent + 1, str, prefix_offset, (flags & DT_NOCLIP) ? NULL : rect); } @@ -1205,7 +1228,10 @@ else if (size.cx > max_width) max_width = size.cx; - y += lh; + if (invert_y) + y -= lh; + else + y += lh; if (dtp) dtp->uiLengthDrawn += len; } @@ -1213,8 +1239,8 @@ if (flags & DT_CALCRECT) { - rect->right = rect->left + max_width; - rect->bottom = y; + rect->right = rect->left + max_width; + rect->bottom = y; if (dtp) rect->right += lmargin + rmargin; } @@ -1225,6 +1251,10 @@ } return y - rect->top; } + +DWORD +WINAPI +GdiGetCodePage(HDC hdc); /*********************************************************************** * DrawTextExA (USER32.@) @@ -1234,11 +1264,11 @@ * string we return. * * @implemented - */ -/* WINE synced 22-May-2006 */ -int WINAPI -DrawTextExA( HDC hdc, LPSTR str, INT count, - LPRECT rect, UINT flags, LPDRAWTEXTPARAMS dtp ) + * + * Synced with wine 1.1.32 + */ +INT WINAPI DrawTextExA( HDC hdc, LPSTR str, INT count, + LPRECT rect, UINT flags, LPDRAWTEXTPARAMS dtp ) { WCHAR *wstr; WCHAR *p; @@ -1247,18 +1277,36 @@ DWORD wcount; DWORD wmax; DWORD amax; + UINT cp; if (!count) return 0; + if (!str && count > 0) return 0; if( !str || ((count == -1) && !(count = strlen(str)))) { + int lh; + TEXTMETRICA tm; + + if (dtp && dtp->cbSize != sizeof(DRAWTEXTPARAMS)) + return 0; + + GetTextMetricsA(hdc, &tm); + if (flags & DT_EXTERNALLEADING) + lh = tm.tmHeight + tm.tmExternalLeading; + else + lh = tm.tmHeight; + if( flags & DT_CALCRECT) { rect->right = rect->left; - rect->bottom = rect->top; - } - return 0; + if( flags & DT_SINGLELINE) + rect->bottom = rect->top + lh; + else + rect->bottom = rect->top; + } + return lh; } - wcount = MultiByteToWideChar( CP_ACP, 0, str, count, NULL, 0 ); + cp = GdiGetCodePage( hdc ); + wcount = MultiByteToWideChar( cp, 0, str, count, NULL, 0 ); wmax = wcount; amax = count; if (flags & DT_MODIFYSTRING) @@ -1269,7 +1317,7 @@ wstr = HeapAlloc(GetProcessHeap(), 0, wmax * sizeof(WCHAR)); if (wstr) { - MultiByteToWideChar( CP_ACP, 0, str, count, wstr, wcount ); + MultiByteToWideChar( cp, 0, str, count, wstr, wcount ); if (flags & DT_MODIFYSTRING) for (i=4, p=wstr+wcount; i--; p++) *p=0xFFFE; /* Initialise the extra characters so that we can see which ones @@ -1283,7 +1331,7 @@ * and so we need to measure it ourselves. */ for (i=4, p=wstr+wcount; i-- && *p != 0xFFFE; p++) wcount++; - WideCharToMultiByte( CP_ACP, 0, wstr, wcount, str, amax, NULL, NULL ); + WideCharToMultiByte( cp, 0, wstr, wcount, str, amax, NULL, NULL ); } HeapFree(GetProcessHeap(), 0, wstr); } @@ -1295,15 +1343,15 @@ * * @implemented */ -int WINAPI -DrawTextW( HDC hdc, LPCWSTR str, INT count, LPRECT rect, UINT flags ) +INT WINAPI DrawTextW( HDC hdc, LPCWSTR str, INT count, LPRECT rect, UINT flags ) { DRAWTEXTPARAMS dtp; memset (&dtp, 0, sizeof(dtp)); + dtp.cbSize = sizeof(dtp); if (flags & DT_TABSTOP) { - dtp.iTabLength = (flags >> 8) && 0xff; + dtp.iTabLength = (flags >> 8) & 0xff; flags &= 0xffff00ff; } return DrawTextExW(hdc, (LPWSTR)str, count, rect, flags, &dtp); @@ -1314,15 +1362,15 @@ * * @implemented */ -int WINAPI -DrawTextA( HDC hdc, LPCSTR str, INT count, LPRECT rect, UINT flags ) +INT WINAPI DrawTextA( HDC hdc, LPCSTR str, INT count, LPRECT rect, UINT flags ) { DRAWTEXTPARAMS dtp; memset (&dtp, 0, sizeof(dtp)); + dtp.cbSize = sizeof(dtp); if (flags & DT_TABSTOP) { - dtp.iTabLength = (flags >> 8) && 0xff; + dtp.iTabLength = (flags >> 8) & 0xff; flags &= 0xffff00ff; } return DrawTextExA( hdc, (LPSTR)str, count, rect, flags, &dtp );

1 0

[cwittich] 43733: partial wine sync to 1.1.32: wininet: Avoid accessing uninitialized memory.
by cwittich＠svn.reactos.org 25 Oct '09

25 Oct '09

Author: cwittich Date: Sun Oct 25 09:52:54 2009 New Revision: 43733 URL: http://svn.reactos.org/svn/reactos?rev=43733&view=rev Log: partial wine sync to 1.1.32: wininet: Avoid accessing uninitialized memory. Modified: trunk/reactos/dll/win32/wininet/ftp.c Modified: trunk/reactos/dll/win32/wininet/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/ftp.c?re… ============================================================================== --- trunk/reactos/dll/win32/wininet/ftp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/ftp.c [iso-8859-1] Sun Oct 25 09:52:54 2009 @@ -708,9 +708,9 @@ ret = FtpFindFirstFileW(hConnect, lpwzSearchFile, lpFindFileDataW, dwFlags, dwContext); HeapFree(GetProcessHeap(), 0, lpwzSearchFile); - if(lpFindFileData) { + if (ret && lpFindFileData) WININET_find_data_WtoA(lpFindFileDataW, lpFindFileData); - } + return ret; }

1 0

[cgutman] 43732: - Fix sending malformed ICMP packets because we read the wrong length from the wrong address in the buffer - Fix the sequence number stored in the packet - Fix potential null pointer freeing - tracert partially works now (Setting TTL isn't implemented yet)
by cgutman＠svn.reactos.org 25 Oct '09

25 Oct '09

Author: cgutman Date: Sun Oct 25 05:30:28 2009 New Revision: 43732 URL: http://svn.reactos.org/svn/reactos?rev=43732&view=rev Log: - Fix sending malformed ICMP packets because we read the wrong length from the wrong address in the buffer - Fix the sequence number stored in the packet - Fix potential null pointer freeing - tracert partially works now (Setting TTL isn't implemented yet) Modified: trunk/reactos/base/applications/network/tracert/tracert.c trunk/reactos/base/applications/network/tracert/tracert.h Modified: trunk/reactos/base/applications/network/tracert/tracert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/tracert/tracert.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/tracert/tracert.c [iso-8859-1] Sun Oct 25 05:30:28 2009 @@ -260,10 +260,10 @@ pInfo->SendPacket->icmpheader.code = 0; pInfo->SendPacket->icmpheader.checksum = 0; pInfo->SendPacket->icmpheader.id = (USHORT)GetCurrentProcessId(); - pInfo->SendPacket->icmpheader.seq = iSeqNum; + pInfo->SendPacket->icmpheader.seq = htons((USHORT)iSeqNum); /* calculate checksum of packet */ - pInfo->SendPacket->icmpheader.checksum = CheckSum((PUSHORT)&pInfo->SendPacket, + pInfo->SendPacket->icmpheader.checksum = CheckSum((PUSHORT)&pInfo->SendPacket->icmpheader, sizeof(ICMP_HEADER) + PACKET_SIZE); } @@ -279,8 +279,8 @@ pInfo->lTimeStart = GetTime(pInfo); iSockRet = sendto(pInfo->icmpSock, //socket - (char *)pInfo->SendPacket, //buffer - PACKET_SIZE, //size of buffer + (char *)&pInfo->SendPacket->icmpheader,//buffer + sizeof(ICMP_HEADER) + PACKET_SIZE,//size of buffer 0, //flags (SOCKADDR *)&pInfo->dest, //destination sizeof(pInfo->dest)); //address length @@ -598,7 +598,7 @@ 0, pInfo->SendPacket); - if (pInfo->SendPacket) + if (pInfo->RecvPacket) HeapFree(GetProcessHeap(), 0, pInfo->RecvPacket); Modified: trunk/reactos/base/applications/network/tracert/tracert.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/tracert/tracert.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/tracert/tracert.h [iso-8859-1] Sun Oct 25 05:30:28 2009 @@ -13,7 +13,7 @@ #define TTL_EXCEEDED 11 #define MAX_PING_PACKET_SIZE 1024 -#define MAX_PING_DATA_SIZE (MAX_PING_PACKET_SIZE + sizeof(IPv4Header) +#define MAX_PING_DATA_SIZE (MAX_PING_PACKET_SIZE + sizeof(IPv4Header)) #define PACKET_SIZE 32 #define ICMP_MIN_SIZE 8 @@ -53,8 +53,8 @@ /* ICMP Echo Reply Header, 12 bytes */ typedef struct EchoReplyHeader { + struct timeval timestamp; struct ICMPHeader icmpheader; - struct timeval timestamp; } ECHO_REPLY_HEADER, *PECHO_REPLY_HEADER; /* ICMP Echo Reply Header, 12 bytes */

1 0

[cgutman] 43731: - Start the sequence number at 1 instead of 0
by cgutman＠svn.reactos.org 25 Oct '09

25 Oct '09

Author: cgutman Date: Sun Oct 25 04:48:15 2009 New Revision: 43731 URL: http://svn.reactos.org/svn/reactos?rev=43731&view=rev Log: - Start the sequence number at 1 instead of 0 Modified: trunk/reactos/base/applications/network/ping/ping.c Modified: trunk/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/ping.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/ping.c [iso-8859-1] Sun Oct 25 04:48:15 2009 @@ -338,7 +338,7 @@ Target.sin_family = AF_INET; TargetIP = inet_ntoa(Target.sin_addr); - CurrentSeqNum = 0; + CurrentSeqNum = 1; SentCount = 0; LostCount = 0; MinRTT.QuadPart = 0;

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
65
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2009