July 2007 - Wine-commits - list.winehq.org

Evan Stade : gdiplus: Changed calls to floor to floorf.
by Alexandre Julliard 11 Jul '07

11 Jul '07

Module: wine Branch: master Commit: 6544d9ee3e149234991406f188b357dd0d9d253b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6544d9ee3e149234991406f18… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 10 18:39:34 2007 -0700 gdiplus: Changed calls to floor to floorf. --- dlls/gdiplus/graphics.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3a88295..af1089a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -208,8 +208,8 @@ static void draw_cap(HDC hdc, COLORREF color, GpLineCap cap, REAL size, /* Using roundr here can make the triangle float off the end of the * line. */ - pt[0].x = ((x2 - x1) >= 0 ? floor(x2 - dx) : ceil(x2 - dx)); - pt[0].y = ((y2 - y1) >= 0 ? floor(y2 - dy) : ceil(y2 - dy)); + pt[0].x = ((x2 - x1) >= 0 ? floorf(x2 - dx) : ceilf(x2 - dx)); + pt[0].y = ((y2 - y1) >= 0 ? floorf(y2 - dy) : ceilf(y2 - dy)); pt[1].x = roundr(pt[0].x + 2.0 * dx); pt[1].y = roundr(pt[0].y + 2.0 * dy); @@ -226,8 +226,8 @@ static void draw_cap(HDC hdc, COLORREF color, GpLineCap cap, REAL size, dx = -cos(M_PI_2 + theta) * size * invert; dy = -sin(M_PI_2 + theta) * size * invert; - pt[0].x = ((x2 - x1) >= 0 ? floor(x2 - dx) : ceil(x2 - dx)); - pt[0].y = ((y2 - y1) >= 0 ? floor(y2 - dy) : ceil(y2 - dy)); + pt[0].x = ((x2 - x1) >= 0 ? floorf(x2 - dx) : ceilf(x2 - dx)); + pt[0].y = ((y2 - y1) >= 0 ? floorf(y2 - dy) : ceilf(y2 - dy)); pt[1].x = roundr(pt[0].x + 2.0 * dx); pt[1].y = roundr(pt[0].y + 2.0 * dy);

1 0

James Hawkins : msi: Fix current _Property table tests and add more tests.
by Alexandre Julliard 11 Jul '07

11 Jul '07

Module: wine Branch: master Commit: 5a8e0e8c1dad256c1b47885b889e63472879d516 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a8e0e8c1dad256c1b47885b8… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Jul 11 00:10:20 2007 -0700 msi: Fix current _Property table tests and add more tests. --- dlls/msi/tests/package.c | 181 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 161 insertions(+), 20 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 2844a26..e30a0db 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -30,6 +30,28 @@ static const char msifile[] = "winetest.msi"; +static UINT do_query(MSIHANDLE hdb, const char *query, MSIHANDLE *phrec) +{ + MSIHANDLE hview = 0; + UINT r, ret; + + /* open a select query */ + r = MsiDatabaseOpenView(hdb, query, &hview); + if (r != ERROR_SUCCESS) + return r; + r = MsiViewExecute(hview, 0); + if (r != ERROR_SUCCESS) + return r; + ret = MsiViewFetch(hview, phrec); + r = MsiViewClose(hview); + if (r != ERROR_SUCCESS) + return r; + r = MsiCloseHandle(hview); + if (r != ERROR_SUCCESS) + return r; + return ret; +} + static UINT run_query( MSIHANDLE hdb, const char *query ) { MSIHANDLE hview = 0; @@ -156,6 +178,15 @@ static UINT create_launchcondition_table( MSIHANDLE hdb ) "PRIMARY KEY `Condition`)" ); } +static UINT create_property_table( MSIHANDLE hdb ) +{ + return run_query( hdb, + "CREATE TABLE `Property` (" + "`Property` CHAR(72) NOT NULL, " + "`Value` CHAR(0) " + "PRIMARY KEY `Property`)" ); +} + static UINT add_component_entry( MSIHANDLE hdb, const char *values ) { char insert[] = "INSERT INTO `Component` " @@ -284,6 +315,22 @@ static UINT add_launchcondition_entry( MSIHANDLE hdb, const char *values ) return r; } +static UINT add_property_entry( MSIHANDLE hdb, const char *values ) +{ + char insert[] = "INSERT INTO `Property` " + "(`Property`, `Value`) " + "VALUES( %s )"; + char *query; + UINT sz, r; + + sz = strlen(values) + sizeof insert; + query = HeapAlloc(GetProcessHeap(),0,sz); + sprintf(query,insert,values); + r = run_query( hdb, query ); + HeapFree(GetProcessHeap(), 0, query); + return r; +} + static UINT set_summary_info(MSIHANDLE hdb) { UINT res; @@ -366,10 +413,12 @@ static MSIHANDLE package_from_db(MSIHANDLE hdb) sprintf(szPackage,"#%li",hdb); res = MsiOpenPackage(szPackage,&hPackage); - ok( res == ERROR_SUCCESS , "Failed to open package\n" ); + if (res != ERROR_SUCCESS) + return 0; res = MsiCloseHandle(hdb); - ok( res == ERROR_SUCCESS , "Failed to close db handle\n" ); + if (res != ERROR_SUCCESS) + return 0; return hPackage; } @@ -1568,13 +1617,52 @@ static void test_props(void) DeleteFile(msifile); } -static void test_properties_table(void) +static BOOL find_prop_in_property(MSIHANDLE hdb, LPCSTR prop, LPCSTR val) +{ + MSIHANDLE hview, hrec; + BOOL found; + CHAR buffer[MAX_PATH]; + DWORD sz; + UINT r; + + r = MsiDatabaseOpenView(hdb, "SELECT * FROM `_Property`", &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + + found = FALSE; + while (r == ERROR_SUCCESS && !found) + { + r = MsiViewFetch(hview, &hrec); + if (r != ERROR_SUCCESS) break; + + sz = MAX_PATH; + r = MsiRecordGetString(hrec, 1, buffer, &sz); + if (r == ERROR_SUCCESS && !lstrcmpA(buffer, prop)) + { + sz = MAX_PATH; + r = MsiRecordGetString(hrec, 2, buffer, &sz); + if (r == ERROR_SUCCESS && !lstrcmpA(buffer, val)) + found = TRUE; + } + + MsiCloseHandle(hrec); + } + + MsiViewClose(hview); + MsiCloseHandle(hview); + + return found; +} + +static void test_property_table(void) { const char *query; UINT r; - MSIHANDLE hpkg, hdb; - char buffer[0x10]; + MSIHANDLE hpkg, hdb, hrec; + char buffer[MAX_PATH]; DWORD sz; + BOOL found; hdb = create_package_db(); ok( hdb, "failed to create package\n"); @@ -1582,45 +1670,98 @@ static void test_properties_table(void) hpkg = package_from_db(hdb); ok( hpkg, "failed to create package\n"); - query = "CREATE TABLE `_Properties` ( " + MsiCloseHandle(hdb); + + hdb = MsiGetActiveDatabase(hpkg); + + query = "CREATE TABLE `_Property` ( " "`foo` INT NOT NULL, `bar` INT LOCALIZABLE PRIMARY KEY `foo`)"; r = run_query(hdb, query); - ok(r == ERROR_INVALID_HANDLE, "failed to create table\n"); + ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); - MsiCloseHandle( hpkg ); + MsiCloseHandle(hdb); + MsiCloseHandle(hpkg); DeleteFile(msifile); hdb = create_package_db(); ok( hdb, "failed to create package\n"); - query = "CREATE TABLE `_Properties` ( " + query = "CREATE TABLE `_Property` ( " "`foo` INT NOT NULL, `bar` INT LOCALIZABLE PRIMARY KEY `foo`)"; r = run_query(hdb, query); ok(r == ERROR_SUCCESS, "failed to create table\n"); - query = "ALTER `_Properties` ADD `foo` INTEGER"; + query = "ALTER `_Property` ADD `foo` INTEGER"; r = run_query(hdb, query); ok(r == ERROR_BAD_QUERY_SYNTAX, "failed to add column\n"); - query = "ALTER TABLE `_Properties` ADD `foo` INTEGER"; + query = "ALTER TABLE `_Property` ADD `foo` INTEGER"; r = run_query(hdb, query); ok(r == ERROR_BAD_QUERY_SYNTAX, "failed to add column\n"); - query = "ALTER TABLE `_Properties` ADD `extra` INTEGER"; + query = "ALTER TABLE `_Property` ADD `extra` INTEGER"; r = run_query(hdb, query); todo_wine ok(r == ERROR_SUCCESS, "failed to add column\n"); hpkg = package_from_db(hdb); - ok( hpkg, "failed to create package\n"); + todo_wine + { + ok(!hpkg, "package should not be created\n"); + } - r = MsiSetProperty( hpkg, "foo", "bar"); - ok(r == ERROR_SUCCESS, "failed to create table\n"); + MsiCloseHandle(hdb); + MsiCloseHandle(hpkg); + DeleteFile(msifile); - sz = sizeof buffer; - r = MsiGetProperty( hpkg, "foo", buffer, &sz); - ok(r == ERROR_SUCCESS, "failed to create table\n"); + hdb = create_package_db(); + ok (hdb, "failed to create package database\n"); - MsiCloseHandle( hpkg ); + r = create_property_table(hdb); + ok(r == ERROR_SUCCESS, "cannot create Property table: %d\n", r); + + r = add_property_entry(hdb, "'prop', 'val'"); + ok(r == ERROR_SUCCESS, "cannot add property: %d\n", r); + + hpkg = package_from_db(hdb); + ok(hpkg, "failed to create package\n"); + + MsiCloseHandle(hdb); + + sz = MAX_PATH; + r = MsiGetProperty(hpkg, "prop", buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buffer, "val"), "Expected val, got %s\n", buffer); + + hdb = MsiGetActiveDatabase(hpkg); + + found = find_prop_in_property(hdb, "prop", "val"); + ok(found, "prop should be in the _Property table\n"); + + r = add_property_entry(hdb, "'dantes', 'mercedes'"); + ok(r == ERROR_SUCCESS, "cannot add property: %d\n", r); + + query = "SELECT * FROM `_Property` WHERE `Property` = 'dantes'"; + r = do_query(hdb, query, &hrec); + ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + + found = find_prop_in_property(hdb, "dantes", "mercedes"); + ok(found == FALSE, "dantes should not be in the _Property table\n"); + + sz = MAX_PATH; + lstrcpy(buffer, "aaa"); + r = MsiGetProperty(hpkg, "dantes", buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(lstrlenA(buffer) == 0, "Expected empty string, got %s\n", buffer); + + r = MsiSetProperty(hpkg, "dantes", "mercedes"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + found = find_prop_in_property(hdb, "dantes", "mercedes"); + ok(found == TRUE, "dantes should be in the _Property table\n"); + + MsiCloseHandle(hdb); + MsiCloseHandle(hrec); + MsiCloseHandle(hpkg); DeleteFile(msifile); } @@ -3307,7 +3448,7 @@ START_TEST(package) test_gettargetpath_bad(); test_settargetpath(); test_props(); - test_properties_table(); + test_property_table(); test_condition(); test_msipackage(); test_formatrecord2();

1 0

James Hawkins : msi: Add tests for adding properties in a transform.
by Alexandre Julliard 11 Jul '07

11 Jul '07

Module: wine Branch: master Commit: 1093eb83cd37c57895154afe21706333421fcae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1093eb83cd37c57895154afe2… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Jul 11 00:11:10 2007 -0700 msi: Add tests for adding properties in a transform. --- dlls/msi/tests/db.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 112 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index a6fe5e3..2c76c97 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1833,6 +1833,15 @@ static void generate_transform(void) r = run_query(hdb1, 0, query); ok(r == ERROR_SUCCESS, "failed to modify row\n"); + query = "CREATE TABLE `Property` ( `Property` CHAR(72) NOT NULL, " + "`Value` CHAR(0) PRIMARY KEY `Property`)"; + r = run_query(hdb1, 0, query); + ok(r == ERROR_SUCCESS, "failed to add property table\n"); + + query = "INSERT INTO `Property` ( `Property`, `Value` ) VALUES ( 'prop', 'val' )"; + r = run_query(hdb1, 0, query); + ok(r == ERROR_SUCCESS, "failed to add property\n"); + /* database needs to be committed */ MsiDatabaseCommit(hdb1); @@ -1856,6 +1865,7 @@ static const WCHAR name5[] = { 0x4840, 0x3f3f, 0x4577, 0x446c, 0x3e6a, 0x44b2, 0 static const WCHAR name6[] = { 0x4840, 0x3e16, 0x4818, 0}; /* MOO */ static const WCHAR name7[] = { 0x4840, 0x3c8b, 0x3a97, 0x409b, 0 }; /* BINARY */ static const WCHAR name8[] = { 0x3c8b, 0x3a97, 0x409b, 0x387e, 0 }; /* BINARY.1 */ +static const WCHAR name9[] = { 0x4840, 0x4559, 0x44f2, 0x4568, 0x4737, 0 }; /* Property */ /* data in each table */ static const WCHAR data1[] = { /* AAR */ @@ -1867,12 +1877,15 @@ static const WCHAR data2[] = { /* _Columns */ 0x0401, 0x0001, 0x8004, 0x0003, 0x9502, 0x0401, 0x0005, 0x0000, 0x0006, 0xbdff, /* 0x0401 = add row (1), 4 shorts */ 0x0401, 0x0005, 0x0000, 0x0007, 0x8502, + 0x0401, 0x000a, 0x0000, 0x000a, 0xad48, + 0x0401, 0x000a, 0x0000, 0x000b, 0x9d00, }; static const WCHAR data3[] = { /* _Tables */ 0x0101, 0x0005, /* 0x0101 = add row (1), 1 short */ + 0x0101, 0x000a, }; static const char data4[] = /* _StringData */ - "MOOCOWPIGcAARCARBARvwbmw"; /* all the strings squashed together */ + "MOOCOWPIGcAARCARBARvwbmwPropertyValuepropval"; /* all the strings squashed together */ static const WCHAR data5[] = { /* _StringPool */ /* len, refs */ 0, 0, /* string 0 '' */ @@ -1885,6 +1898,10 @@ static const WCHAR data5[] = { /* _StringPool */ 3, 1, /* string 7 'BAR' */ 2, 1, /* string 8 'vw' */ 3, 1, /* string 9 'bmw' */ + 8, 4, /* string 10 'Property' */ + 5, 1, /* string 11 'Value' */ + 4, 1, /* string 12 'prop' */ + 3, 1, /* string 13 'val' */ }; /* update row, 0x0002 is a bitmask of present column data, keys are excluded */ static const WCHAR data6[] = { /* MOO */ @@ -1899,6 +1916,10 @@ static const WCHAR data7[] = { /* BINARY */ static const char data8[] = /* stream data for the BINARY table */ "naengmyon"; +static const WCHAR data9[] = { /* Property */ + 0x0201, 0x000c, 0x000d, +}; + static const struct { LPCWSTR name; const void *data; @@ -1913,6 +1934,7 @@ static const struct { { name6, data6, sizeof data6 }, { name7, data7, sizeof data7 }, { name8, data8, sizeof data8 - 1 }, + { name9, data9, sizeof data9 }, }; #define NUM_TRANSFORM_TABLES (sizeof table_transform_data/sizeof table_transform_data[0]) @@ -1958,21 +1980,94 @@ static void generate_transform_manual(void) IStorage_Release(stg); } +static UINT set_summary_info(MSIHANDLE hdb) +{ + UINT res; + MSIHANDLE suminfo; + + /* build summmary info */ + res = MsiGetSummaryInformation(hdb, NULL, 7, &suminfo); + ok( res == ERROR_SUCCESS , "Failed to open summaryinfo\n" ); + + res = MsiSummaryInfoSetProperty(suminfo,2, VT_LPSTR, 0,NULL, + "Installation Database"); + ok( res == ERROR_SUCCESS , "Failed to set summary info\n" ); + + res = MsiSummaryInfoSetProperty(suminfo,3, VT_LPSTR, 0,NULL, + "Installation Database"); + ok( res == ERROR_SUCCESS , "Failed to set summary info\n" ); + + res = MsiSummaryInfoSetProperty(suminfo,4, VT_LPSTR, 0,NULL, + "Wine Hackers"); + ok( res == ERROR_SUCCESS , "Failed to set summary info\n" ); + + res = MsiSummaryInfoSetProperty(suminfo,7, VT_LPSTR, 0,NULL, + ";1033"); + ok( res == ERROR_SUCCESS , "Failed to set summary info\n" ); + + res = MsiSummaryInfoSetProperty(suminfo,9, VT_LPSTR, 0,NULL, + "{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}"); + ok( res == ERROR_SUCCESS , "Failed to set summary info\n" ); + + res = MsiSummaryInfoSetProperty(suminfo, 14, VT_I4, 100, NULL, NULL); + ok( res == ERROR_SUCCESS , "Failed to set summary info\n" ); + + res = MsiSummaryInfoSetProperty(suminfo, 15, VT_I4, 0, NULL, NULL); + ok( res == ERROR_SUCCESS , "Failed to set summary info\n" ); + + res = MsiSummaryInfoPersist(suminfo); + ok( res == ERROR_SUCCESS , "Failed to make summary info persist\n" ); + + res = MsiCloseHandle( suminfo); + ok( res == ERROR_SUCCESS , "Failed to close suminfo\n" ); + + return res; +} + +static MSIHANDLE create_package_db(LPCSTR filename) +{ + MSIHANDLE hdb = 0; + UINT res; + + DeleteFile(msifile); + + /* create an empty database */ + res = MsiOpenDatabase(filename, MSIDBOPEN_CREATE, &hdb ); + ok( res == ERROR_SUCCESS , "Failed to create database\n" ); + if( res != ERROR_SUCCESS ) + return hdb; + + res = MsiDatabaseCommit( hdb ); + ok( res == ERROR_SUCCESS , "Failed to commit database\n" ); + + res = set_summary_info(hdb); + + res = run_query( hdb, 0, + "CREATE TABLE `Directory` ( " + "`Directory` CHAR(255) NOT NULL, " + "`Directory_Parent` CHAR(255), " + "`DefaultDir` CHAR(255) NOT NULL " + "PRIMARY KEY `Directory`)" ); + ok( res == ERROR_SUCCESS , "Failed to create directory table\n" ); + + return hdb; +} + static void test_try_transform(void) { - MSIHANDLE hdb, hview, hrec; + MSIHANDLE hdb, hview, hrec, hpkg; LPCSTR query; UINT r; DWORD sz; - char buffer[0x10]; + char buffer[MAX_PATH]; DeleteFile(msifile); DeleteFile(msifile2); DeleteFile(mstfile); - /* create an empty database */ - r = MsiOpenDatabase(msifile2, MSIDBOPEN_CREATE, &hdb ); - ok( r == ERROR_SUCCESS , "Failed to create database\n" ); + /* create the database */ + hdb = create_package_db(msifile2); + ok(hdb, "Failed to create package db\n"); query = "CREATE TABLE `MOO` ( `NOO` SHORT NOT NULL, `OOO` CHAR(255) PRIMARY KEY `NOO`)"; r = run_query(hdb, 0, query); @@ -2134,6 +2229,17 @@ static void test_try_transform(void) MsiCloseHandle(hview); MsiCloseHandle(hdb); + /* check that the property was added */ + r = MsiOpenPackage(msifile2, &hpkg); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + sz = MAX_PATH; + r = MsiGetProperty(hpkg, "prop", buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buffer, "val"), "Expected val, got %s\n", buffer); + + MsiCloseHandle(hpkg); + DeleteFile(msifile); DeleteFile(msifile2); DeleteFile(mstfile);

1 0

Aric Stewart : imm32: Use the COMPOSITIONSTRING in hCompStr.
by Alexandre Julliard 11 Jul '07

11 Jul '07

Module: wine Branch: master Commit: 5db70db76e8d9d947852cf5af01f55cd8565930c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5db70db76e8d9d947852cf5af… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jul 10 14:19:22 2007 -0500 imm32: Use the COMPOSITIONSTRING in hCompStr. Stop using our custom structure for the Composition string and instead use the COMPOSITIONSTRING whose handle is in the IMC structure. --- dlls/imm32/imm.c | 672 ++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 477 insertions(+), 195 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5db70db76e8d9d947852c…

1 0

Lei Zhang : start.exe: Put double quotes around arguments with spaces.
by Alexandre Julliard 11 Jul '07

11 Jul '07

Module: wine Branch: master Commit: 30a22664e66f8625522e734741979977c6f54e7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=30a22664e66f8625522e73474… Author: Lei Zhang <thestig(a)google.com> Date: Tue Jul 10 14:47:02 2007 -0700 start.exe: Put double quotes around arguments with spaces. --- programs/start/start.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/programs/start/start.c b/programs/start/start.c index 1c437fb..b3a8f1c 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -107,12 +107,21 @@ static char *build_args( int argc, char **argv ) char *ret, *p; for (i = 0; i < argc; i++ ) + { len += strlen(argv[i]) + 1; + if (strchr(argv[i], ' ')) + len += 2; + } ret = HeapAlloc( GetProcessHeap(), 0, len ); ret[0] = 0; for (i = 0, p = ret; i < argc; i++ ) - p += sprintf(p, " %s", argv[i]); + { + if (strchr(argv[i], ' ')) + p += sprintf(p, " \"%s\"", argv[i]); + else + p += sprintf(p, " %s", argv[i]); + } return ret; }

1 0

Chris Robinson : winemp3: Remove global mpstr pointer.
by Alexandre Julliard 11 Jul '07

11 Jul '07

Module: wine Branch: master Commit: fa969d169b64afd7bfd9bd5eecb5aca093050311 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa969d169b64afd7bfd9bd5ee… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Jul 10 12:09:25 2007 -0700 winemp3: Remove global mpstr pointer. --- dlls/winemp3.acm/decode_i386.c | 16 +++++++--------- dlls/winemp3.acm/interface.c | 14 +++++--------- dlls/winemp3.acm/layer1.c | 6 +++--- dlls/winemp3.acm/layer2.c | 6 +++--- dlls/winemp3.acm/layer3.c | 18 ++++++++---------- dlls/winemp3.acm/mpg123.h | 8 +++++--- 6 files changed, 31 insertions(+), 37 deletions(-) diff --git a/dlls/winemp3.acm/decode_i386.c b/dlls/winemp3.acm/decode_i386.c index 575c53c..9875cd8 100644 --- a/dlls/winemp3.acm/decode_i386.c +++ b/dlls/winemp3.acm/decode_i386.c @@ -31,22 +31,20 @@ #include "mpg123.h" #include "mpglib.h" -extern struct mpstr *gmp; - /* old WRITE_SAMPLE */ #define WRITE_SAMPLE(samples,sum,clip) \ if( (sum) > 32767.0) { *(samples) = 0x7fff; (clip)++; } \ else if( (sum) < -32768.0) { *(samples) = -0x8000; (clip)++; } \ else { *(samples) = sum; } -int synth_1to1_mono(real *bandPtr,unsigned char *samples,int *pnt) +int synth_1to1_mono(struct mpstr *mp,real *bandPtr,unsigned char *samples,int *pnt) { short samples_tmp[64]; short *tmp1 = samples_tmp; int i,ret; int pnt1 = 0; - ret = synth_1to1(bandPtr,0,(unsigned char *) samples_tmp,&pnt1); + ret = synth_1to1(mp,bandPtr,0,(unsigned char *) samples_tmp,&pnt1); samples += *pnt; for(i=0;i<32;i++) { @@ -60,7 +58,7 @@ int synth_1to1_mono(real *bandPtr,unsigned char *samples,int *pnt) } -int synth_1to1(real *bandPtr,int channel,unsigned char *out,int *pnt) +int synth_1to1(struct mpstr *mp,real *bandPtr,int channel,unsigned char *out,int *pnt) { static const int step = 2; int bo; @@ -70,16 +68,16 @@ int synth_1to1(real *bandPtr,int channel,unsigned char *out,int *pnt) int clip = 0; int bo1; - bo = gmp->synth_bo; + bo = mp->synth_bo; if(!channel) { bo--; bo &= 0xf; - buf = gmp->synth_buffs[0]; + buf = mp->synth_buffs[0]; } else { samples++; - buf = gmp->synth_buffs[1]; + buf = mp->synth_buffs[1]; } if(bo & 0x1) { @@ -93,7 +91,7 @@ int synth_1to1(real *bandPtr,int channel,unsigned char *out,int *pnt) dct64(buf[0]+bo,buf[1]+bo+1,bandPtr); } - gmp->synth_bo = bo; + mp->synth_bo = bo; { register int j; diff --git a/dlls/winemp3.acm/interface.c b/dlls/winemp3.acm/interface.c index 6f039a7..2ac120a 100644 --- a/dlls/winemp3.acm/interface.c +++ b/dlls/winemp3.acm/interface.c @@ -22,9 +22,6 @@ #include "mpg123.h" #include "mpglib.h" -/* Global mp .. it's a hack */ -struct mpstr *gmp; - BOOL InitMP3(struct mpstr *mp) { @@ -39,6 +36,7 @@ BOOL InitMP3(struct mpstr *mp) mp->fr.single = -1; mp->bsnum = 0; mp->synth_bo = 1; + mp->fr.mp = mp; if(!init) { init = 1; @@ -152,8 +150,6 @@ int decodeMP3(struct mpstr *mp,const unsigned char *in,int isize,unsigned char * { int len; - gmp = mp; - if(osize < 4608) { fprintf(stderr,"To less out space\n"); return MP3_ERR; @@ -224,17 +220,17 @@ int decodeMP3(struct mpstr *mp,const unsigned char *in,int isize,unsigned char * return MP3_OK; } -int set_pointer(long backstep) +int set_pointer(struct mpstr *mp, long backstep) { unsigned char *bsbufold; - if(gmp->fsizeold < 0 && backstep > 0) { + if(mp->fsizeold < 0 && backstep > 0) { fprintf(stderr,"Can't step back %ld!\n",backstep); return MP3_ERR; } - bsbufold = gmp->bsspace[gmp->bsnum] + 512; + bsbufold = mp->bsspace[mp->bsnum] + 512; wordpointer -= backstep; if (backstep) - memcpy(wordpointer,bsbufold+gmp->fsizeold-backstep,backstep); + memcpy(wordpointer,bsbufold+mp->fsizeold-backstep,backstep); bitindex = 0; return MP3_OK; } diff --git a/dlls/winemp3.acm/layer1.c b/dlls/winemp3.acm/layer1.c index 45caf30..16bc55c 100644 --- a/dlls/winemp3.acm/layer1.c +++ b/dlls/winemp3.acm/layer1.c @@ -146,12 +146,12 @@ int do_layer1(struct frame *fr,unsigned char *pcm_sample,int *pcm_point) I_step_two(fraction,balloc,scale_index,fr); if(single >= 0) { - clip += synth_1to1_mono( (real*)fraction[single],pcm_sample,pcm_point); + clip += synth_1to1_mono(fr->mp,(real*)fraction[single],pcm_sample,pcm_point); } else { int p1 = *pcm_point; - clip += synth_1to1( (real*)fraction[0],0,pcm_sample,&p1); - clip += synth_1to1( (real*)fraction[1],1,pcm_sample,pcm_point); + clip += synth_1to1(fr->mp,(real*)fraction[0],0,pcm_sample,&p1); + clip += synth_1to1(fr->mp,(real*)fraction[1],1,pcm_sample,pcm_point); } } diff --git a/dlls/winemp3.acm/layer2.c b/dlls/winemp3.acm/layer2.c index 5e3fbdf..d3cd463 100644 --- a/dlls/winemp3.acm/layer2.c +++ b/dlls/winemp3.acm/layer2.c @@ -286,12 +286,12 @@ int do_layer2(struct frame *fr,unsigned char *pcm_sample,int *pcm_point) II_step_two(bit_alloc,fraction,scale,fr,i>>2); for (j=0;j<3;j++) { if(single >= 0) { - clip += synth_1to1_mono(fraction[0][j],pcm_sample,pcm_point); + clip += synth_1to1_mono(fr->mp,fraction[0][j],pcm_sample,pcm_point); } else { int p1 = *pcm_point; - clip += synth_1to1(fraction[0][j],0,pcm_sample,&p1); - clip += synth_1to1(fraction[1][j],1,pcm_sample,pcm_point); + clip += synth_1to1(fr->mp,fraction[0][j],0,pcm_sample,&p1); + clip += synth_1to1(fr->mp,fraction[1][j],1,pcm_sample,pcm_point); } } diff --git a/dlls/winemp3.acm/layer3.c b/dlls/winemp3.acm/layer3.c index 398a0a0..129d821 100644 --- a/dlls/winemp3.acm/layer3.c +++ b/dlls/winemp3.acm/layer3.c @@ -25,8 +25,6 @@ #include "mpglib.h" #include "huffman.h" -extern struct mpstr *gmp; - #define MPEG1 @@ -1830,11 +1828,11 @@ static void dct12(real *in,real *rawout1,real *rawout2,register real *wi,registe * III_hybrid */ static void III_hybrid(real fsIn[SBLIMIT][SSLIMIT],real tsOut[SSLIMIT][SBLIMIT], - int ch,struct gr_info_s *gr_info) + int ch,struct gr_info_s *gr_info,struct mpstr *mp) { real *tspnt = (real *) tsOut; - real (*block)[2][SBLIMIT*SSLIMIT] = gmp->hybrid_block; - int *blc = gmp->hybrid_blc; + real (*block)[2][SBLIMIT*SSLIMIT] = mp->hybrid_block; + int *blc = mp->hybrid_blc; real *rawout1,*rawout2; int bt; int sb = 0; @@ -1923,7 +1921,7 @@ int do_layer3(struct frame *fr,unsigned char *pcm_sample,int *pcm_point) #endif } - if(set_pointer(sideinfo.main_data_begin) == MP3_ERR) + if(set_pointer(fr->mp,sideinfo.main_data_begin) == MP3_ERR) return -1; for (gr=0;gr<granules;gr++) @@ -2006,17 +2004,17 @@ int do_layer3(struct frame *fr,unsigned char *pcm_sample,int *pcm_point) for(ch=0;ch<stereo1;ch++) { struct gr_info_s *gr_info = &(sideinfo.ch[ch].gr[gr]); III_antialias(hybridIn[ch],gr_info); - III_hybrid(hybridIn[ch], hybridOut[ch], ch,gr_info); + III_hybrid(hybridIn[ch], hybridOut[ch], ch,gr_info, fr->mp); } for(ss=0;ss<SSLIMIT;ss++) { if(single >= 0) { - clip += synth_1to1_mono(hybridOut[0][ss],pcm_sample,pcm_point); + clip += synth_1to1_mono(fr->mp,hybridOut[0][ss],pcm_sample,pcm_point); } else { int p1 = *pcm_point; - clip += synth_1to1(hybridOut[0][ss],0,pcm_sample,&p1); - clip += synth_1to1(hybridOut[1][ss],1,pcm_sample,pcm_point); + clip += synth_1to1(fr->mp,hybridOut[0][ss],0,pcm_sample,&p1); + clip += synth_1to1(fr->mp,hybridOut[1][ss],1,pcm_sample,pcm_point); } } } diff --git a/dlls/winemp3.acm/mpg123.h b/dlls/winemp3.acm/mpg123.h index b397641..14ebe11 100644 --- a/dlls/winemp3.acm/mpg123.h +++ b/dlls/winemp3.acm/mpg123.h @@ -105,6 +105,8 @@ struct frame { /* layer2 stuff */ int II_sblimit; const struct al_table *alloc; + + struct mpstr *mp; }; struct parameter { @@ -117,7 +119,7 @@ struct parameter { extern unsigned int get1bit(void); extern unsigned int getbits(int); extern unsigned int getbits_fast(int); -extern int set_pointer(long); +extern int set_pointer(struct mpstr *,long); extern unsigned char *wordpointer; extern int bitindex; @@ -160,9 +162,9 @@ struct III_sideinfo } ch[2]; }; -extern int synth_1to1 (real *,int,unsigned char *,int *); +extern int synth_1to1 (struct mpstr *,real *,int,unsigned char *,int *); extern int synth_1to1_8bit (real *,int,unsigned char *,int *); -extern int synth_1to1_mono (real *,unsigned char *,int *); +extern int synth_1to1_mono (struct mpstr *,real *,unsigned char *,int *); extern int synth_1to1_mono2stereo (real *,unsigned char *,int *); extern int synth_1to1_8bit_mono (real *,unsigned char *,int *); extern int synth_1to1_8bit_mono2stereo (real *,unsigned char *,int *);

1 0

Chris Robinson : winemp3: Remove function declarations with no definition and unused macros.
by Alexandre Julliard 11 Jul '07

11 Jul '07

Module: wine Branch: master Commit: 8a865e5a0bec90632a24623e65a06e03077ba827 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a865e5a0bec90632a24623e6… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Jul 10 13:53:49 2007 -0700 winemp3: Remove function declarations with no definition and unused macros. --- dlls/winemp3.acm/mpg123.h | 42 ------------------------------------------ 1 files changed, 0 insertions(+), 42 deletions(-) diff --git a/dlls/winemp3.acm/mpg123.h b/dlls/winemp3.acm/mpg123.h index 14ebe11..1648408 100644 --- a/dlls/winemp3.acm/mpg123.h +++ b/dlls/winemp3.acm/mpg123.h @@ -34,10 +34,6 @@ # define M_PI 3.14159265358979323846 # define M_SQRT2 1.41421356237309504880 # define REAL_IS_FLOAT -# define NEW_DCT9 - -# define random rand -# define srandom srand #endif @@ -55,9 +51,6 @@ #define INLINE #endif -/* AUDIOBUFSIZE = n*64 with n=1,2,3 ... */ -#define AUDIOBUFSIZE 16384 - #ifndef FALSE #define FALSE 0 #endif @@ -79,9 +72,6 @@ #define MAXFRAMESIZE 1792 -/* Pre Shift fo 16 to 8 bit converter table */ -#define AUSHIFT (3) - struct frame { int stereo; int jsbound; @@ -163,45 +153,13 @@ struct III_sideinfo }; extern int synth_1to1 (struct mpstr *,real *,int,unsigned char *,int *); -extern int synth_1to1_8bit (real *,int,unsigned char *,int *); extern int synth_1to1_mono (struct mpstr *,real *,unsigned char *,int *); -extern int synth_1to1_mono2stereo (real *,unsigned char *,int *); -extern int synth_1to1_8bit_mono (real *,unsigned char *,int *); -extern int synth_1to1_8bit_mono2stereo (real *,unsigned char *,int *); - -extern int synth_2to1 (real *,int,unsigned char *,int *); -extern int synth_2to1_8bit (real *,int,unsigned char *,int *); -extern int synth_2to1_mono (real *,unsigned char *,int *); -extern int synth_2to1_mono2stereo (real *,unsigned char *,int *); -extern int synth_2to1_8bit_mono (real *,unsigned char *,int *); -extern int synth_2to1_8bit_mono2stereo (real *,unsigned char *,int *); - -extern int synth_4to1 (real *,int,unsigned char *,int *); -extern int synth_4to1_8bit (real *,int,unsigned char *,int *); -extern int synth_4to1_mono (real *,unsigned char *,int *); -extern int synth_4to1_mono2stereo (real *,unsigned char *,int *); -extern int synth_4to1_8bit_mono (real *,unsigned char *,int *); -extern int synth_4to1_8bit_mono2stereo (real *,unsigned char *,int *); - -extern int synth_ntom (real *,int,unsigned char *,int *); -extern int synth_ntom_8bit (real *,int,unsigned char *,int *); -extern int synth_ntom_mono (real *,unsigned char *,int *); -extern int synth_ntom_mono2stereo (real *,unsigned char *,int *); -extern int synth_ntom_8bit_mono (real *,unsigned char *,int *); -extern int synth_ntom_8bit_mono2stereo (real *,unsigned char *,int *); - -extern void rewindNbits(int bits); -extern int hsstell(void); -extern int get_songlen(struct frame *fr,int no); extern void init_layer3(int); extern void init_layer2(void); extern void make_decode_tables(long scale); -extern void make_conv16to8_table(int); extern void dct64(real *,real *,real *); -extern void synth_ntom_set_step(long,long); - extern unsigned char *conv16to8; extern const long freqs[9]; extern real muls[27][64];

1 0

Misha Koshelev : urlmon: Implement HttpProtocol.
by Alexandre Julliard 11 Jul '07

11 Jul '07

Module: wine Branch: master Commit: dab80a8d9f3ffe5a8362578da5ae80e6781a9c2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dab80a8d9f3ffe5a8362578da… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Tue Jul 10 10:52:03 2007 -0500 urlmon: Implement HttpProtocol. --- dlls/urlmon/http.c | 560 +++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/tests/protocol.c | 4 +- 2 files changed, 548 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dab80a8d9f3ffe5a83625…

1 0

Dmitry Timoshkov : gdi32: Do not report an error if a requested to add font is already loaded.
by Alexandre Julliard 11 Jul '07

11 Jul '07

Module: wine Branch: master Commit: cfe289e69d2a189315ad0e77ecb347fc8c5752a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfe289e69d2a189315ad0e77e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jul 11 15:07:30 2007 +0900 gdi32: Do not report an error if a requested to add font is already loaded. --- dlls/gdi32/freetype.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 8a18a37..cdd23ef 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1135,13 +1135,13 @@ static INT AddFontFileToList(const char *file, char *fake_family, const WCHAR *t TRACE("This font is a replacement but the original really exists, so we'll skip the replacement\n"); HeapFree(GetProcessHeap(), 0, StyleW); pFT_Done_Face(ft_face); - return 0; + return 1; } if(!pHeader || pHeader->Font_Revision <= face->font_version) { TRACE("Original font is newer so skipping this one\n"); HeapFree(GetProcessHeap(), 0, StyleW); pFT_Done_Face(ft_face); - return 0; + return 1; } else { TRACE("Replacing original with this one\n"); list_remove(&face->entry);

1 0

Alexandre Julliard : configure: Fix typo in liblcms notice check.
by Alexandre Julliard 11 Jul '07

11 Jul '07

Module: wine Branch: master Commit: 82e068046b082e2d33a6f8e946c2279a3ad4736b URL: http://source.winehq.org/git/wine.git/?a=commit;h=82e068046b082e2d33a6f8e94… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 11 12:01:15 2007 +0200 configure: Fix typo in liblcms notice check. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 8567e53..5a85caf 100755 --- a/configure +++ b/configure @@ -12613,7 +12613,7 @@ _ACEOF fi fi -if test "$ac_cv_lib_lcms_cmsOpenProfileFromFile" = "yes"; then +if test "$ac_cv_lib_lcms_cmsOpenProfileFromFile" != "yes"; then wine_notices="$wine_notices|liblcms development files not found. Wine will be built without Color Management support. (mscms.dll)" fi diff --git a/configure.ac b/configure.ac index 227e410..9ab2c77 100644 --- a/configure.ac +++ b/configure.ac @@ -829,7 +829,7 @@ then [AC_DEFINE(HAVE_LCMS, 1, [Define if you have the LittleCMS development environment]) LCMSLIBS="-llcms"]) fi -WINE_NOTICE_IF([test "$ac_cv_lib_lcms_cmsOpenProfileFromFile" = "yes"],[liblcms development files not found. +WINE_NOTICE_IF([test "$ac_cv_lib_lcms_cmsOpenProfileFromFile" != "yes"],[liblcms development files not found. Wine will be built without Color Management support. (mscms.dll)]) dnl **** Check for OpenLDAP ***

1 0