March 2008 - Wine-Commits - list.winehq.org

Andrew Talbot : msvfw32: Assign to structs instead of using memcpy.
by Alexandre Julliard March 7, 2008

March 7, 2008

Module: wine Branch: master Commit: 0d80791371d53b1fa3be998339e90d0fb396e0fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d80791371d53b1fa3be99833… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Mar 6 22:33:56 2008 +0000 msvfw32: Assign to structs instead of using memcpy. --- dlls/msvfw32/msvideo_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index aaf8d0c..baea47b 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -753,7 +753,7 @@ static BOOL enum_compressors(HWND list, COMPVARS *pcv, BOOL enum_all) idx = SendMessageW(list, CB_ADDSTRING, 0, (LPARAM)icinfo.szDescription); ic = HeapAlloc(GetProcessHeap(), 0, sizeof(struct codec_info)); - memcpy(&ic->icinfo, &icinfo, sizeof(ICINFO)); + ic->icinfo = icinfo; ic->hic = hic; SendMessageW(list, CB_SETITEMDATA, idx, (LPARAM)ic); } @@ -1449,7 +1449,7 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) if (!pc->lpbiIn) return FALSE; - memcpy(pc->lpbiIn, lpbiIn, sizeof(BITMAPINFO)); + *pc->lpbiIn = *lpbiIn; pc->lpBitsPrev = HeapAlloc(GetProcessHeap(), 0, pc->lpbiIn->bmiHeader.biSizeImage); if (!pc->lpBitsPrev) {

1 0

Huw Davies : ole32: Fix CopyTo to work correctly with LARGE_INTEGERs.
by Alexandre Julliard March 7, 2008

March 7, 2008

Module: wine Branch: master Commit: 60ee0c3eff0234bc67c054613f6f9899f1426212 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60ee0c3eff0234bc67c054613… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 6 15:13:24 2008 +0000 ole32: Fix CopyTo to work correctly with LARGE_INTEGERs. --- dlls/ole32/stg_stream.c | 38 +++++++++++--------------------------- 1 files changed, 11 insertions(+), 27 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 1bcb40b..a443fcc 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -689,28 +689,23 @@ static HRESULT WINAPI StgStreamImpl_CopyTo( if ( pstm == 0 ) return STG_E_INVALIDPOINTER; - totalBytesRead.u.LowPart = totalBytesRead.u.HighPart = 0; - totalBytesWritten.u.LowPart = totalBytesWritten.u.HighPart = 0; + totalBytesRead.QuadPart = 0; + totalBytesWritten.QuadPart = 0; - /* - * use stack to store data temporarily - * there is surely a more performant way of doing it, for now this basic - * implementation will do the job - */ - while ( cb.u.LowPart > 0 ) + while ( cb.QuadPart > 0 ) { - if ( cb.u.LowPart >= 128 ) - copySize = 128; + if ( cb.QuadPart >= sizeof(tmpBuffer) ) + copySize = sizeof(tmpBuffer); else copySize = cb.u.LowPart; IStream_Read(iface, tmpBuffer, copySize, &bytesRead); - totalBytesRead.u.LowPart += bytesRead; + totalBytesRead.QuadPart += bytesRead; IStream_Write(pstm, tmpBuffer, bytesRead, &bytesWritten); - totalBytesWritten.u.LowPart += bytesWritten; + totalBytesWritten.QuadPart += bytesWritten; /* * Check that read & write operations were successful @@ -723,25 +718,14 @@ static HRESULT WINAPI StgStreamImpl_CopyTo( } if (bytesRead!=copySize) - cb.u.LowPart = 0; + cb.QuadPart = 0; else - cb.u.LowPart -= bytesRead; + cb.QuadPart -= bytesRead; } - /* - * Update number of bytes read and written - */ - if (pcbRead) - { - pcbRead->u.LowPart = totalBytesRead.u.LowPart; - pcbRead->u.HighPart = totalBytesRead.u.HighPart; - } + if (pcbRead) pcbRead->QuadPart = totalBytesRead.QuadPart; + if (pcbWritten) pcbWritten->QuadPart = totalBytesWritten.QuadPart; - if (pcbWritten) - { - pcbWritten->u.LowPart = totalBytesWritten.u.LowPart; - pcbWritten->u.HighPart = totalBytesWritten.u.HighPart; - } return hr; }

1 0

Dan Kegel : winex11: wintab.c: use atan2 instead of atan.
by Alexandre Julliard March 7, 2008

March 7, 2008

Module: wine Branch: master Commit: 1eba6c7644f801f82c66b109f39d754f0c4e05f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eba6c7644f801f82c66b109f… Author: Dan Kegel <dank(a)kegel.com> Date: Thu Mar 6 12:33:09 2008 -0800 winex11: wintab.c: use atan2 instead of atan. --- dlls/winex11.drv/wintab.c | 33 ++++++--------------------------- 1 files changed, 6 insertions(+), 27 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index da18ce0..e5d7071 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -742,35 +742,14 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) static int figure_deg(int x, int y) { - int rc; + float angle; - if (y != 0) - { - rc = (int) 10 * (atan( (FLOAT)abs(y) / (FLOAT)abs(x)) / (3.1415 / 180)); - if (y>0) - { - if (x>0) - rc += 900; - else - rc = 2700 - rc; - } - else - { - if (x>0) - rc = 900 - rc; - else - rc += 2700; - } - } - else - { - if (x >= 0) - rc = 900; - else - rc = 2700; - } + angle = atan2((float)y, (float)x); + angle += M_PI_2; + if (angle <= 0) + angle += 2 * M_PI; - return rc; + return (0.5 + (angle * 1800.0 / M_PI)); } static int get_button_state(int curnum)

1 0

Mikołaj Zalewski : comctl32: rebar: Fix SizeToHeight when no bands visible.
by Alexandre Julliard March 7, 2008

March 7, 2008

Module: wine Branch: master Commit: d3608cf4b2e08c843f2b914cbd8eeeea8510334e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3608cf4b2e08c843f2b914cb… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Mar 6 22:06:21 2008 +0100 comctl32: rebar: Fix SizeToHeight when no bands visible. --- dlls/comctl32/rebar.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 9a3f8d5..f1f823a 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1442,6 +1442,9 @@ REBAR_SizeToHeight(REBAR_INFO *infoPtr, int height) UINT uNumRows = infoPtr->uNumRows; int i; + if (uNumRows == 0) /* avoid division by 0 */ + return; + /* That's not exactly what Windows does but should be similar */ /* Pass one: break-up/glue rows */

1 0

Paul Vriens : advapi32/tests: Fix a few typos.
by Alexandre Julliard March 7, 2008

March 7, 2008

Module: wine Branch: master Commit: 81e0ef44e9c9e9aaa1e9d96d7313805cabafd98a URL: http://source.winehq.org/git/wine.git/?a=commit;h=81e0ef44e9c9e9aaa1e9d96d7… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Mar 6 21:10:49 2008 +0100 advapi32/tests: Fix a few typos. --- dlls/advapi32/tests/security.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 9ff02e9..027af2e 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1685,14 +1685,14 @@ static void test_security_descriptor(void) ok(GetSecurityDescriptorOwner(&sd, &psid, &isDefault), "GetSecurityDescriptorOwner failed\n"); expect_eq(psid, NULL, PSID, "%p"); expect_eq(isDefault, FALSE, BOOL, "%d"); - ok(GetSecurityDescriptorGroup(&sd, &psid, &isDefault), "GetSecurityDescriptorOwner failed\n"); + ok(GetSecurityDescriptorGroup(&sd, &psid, &isDefault), "GetSecurityDescriptorGroup failed\n"); expect_eq(psid, NULL, PSID, "%p"); expect_eq(isDefault, FALSE, BOOL, "%d"); - ok(GetSecurityDescriptorDacl(&sd, &isPresent, &pacl, &isDefault), "GetSecurityDescriptorOwner failed\n"); + ok(GetSecurityDescriptorDacl(&sd, &isPresent, &pacl, &isDefault), "GetSecurityDescriptorDacl failed\n"); expect_eq(isPresent, TRUE, BOOL, "%d"); expect_eq(psid, NULL, PSID, "%p"); expect_eq(isDefault, FALSE, BOOL, "%d"); - ok(GetSecurityDescriptorSacl(&sd, &isPresent, &pacl, &isDefault), "GetSecurityDescriptorOwner failed\n"); + ok(GetSecurityDescriptorSacl(&sd, &isPresent, &pacl, &isDefault), "GetSecurityDescriptorSacl failed\n"); expect_eq(isPresent, TRUE, BOOL, "%d"); expect_eq(psid, NULL, PSID, "%p"); expect_eq(isDefault, FALSE, BOOL, "%d");

1 0

Ove Kaaven : msi: Fix bug in handling of multivolume CAB files.
by Alexandre Julliard March 7, 2008

March 7, 2008

Module: wine Branch: master Commit: be874f1a265d03aeb202c70beb7fdcd856a7128a URL: http://source.winehq.org/git/wine.git/?a=commit;h=be874f1a265d03aeb202c70be… Author: Ove Kaaven <ovek(a)transgaming.com> Date: Tue Mar 4 18:16:27 2008 +0100 msi: Fix bug in handling of multivolume CAB files. --- dlls/msi/files.c | 3 ++ dlls/msi/tests/install.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 0 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 33a3a5a..b43337a 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -401,10 +401,13 @@ static INT_PTR cabinet_notify(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) } case fdintCLOSE_FILE_INFO: { + CabData *data = (CabData*) pfdin->pv; FILETIME ft; FILETIME ftLocal; HANDLE handle = (HANDLE) pfdin->hf; + data->mi->is_continuous = FALSE; + if (!DosDateTimeToFileTime(pfdin->date, pfdin->time, &ft)) return -1; if (!LocalFileTimeToFileTime(&ft, &ftLocal)) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 03a7506..99c99d4 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -175,6 +175,13 @@ static const CHAR cc_component_dat[] = "Component\tComponentId\tDirectory_\tAttr "augustus\t\tMSITESTDIR\t0\t1\taugustus\n" "caesar\t\tMSITESTDIR\t0\t1\tcaesar\n"; +static const CHAR cc2_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "maximus\t\tMSITESTDIR\t0\t1\tmaximus\n" + "augustus\t\tMSITESTDIR\t0\t0\taugustus\n" + "caesar\t\tMSITESTDIR\t0\t1\tcaesar\n"; + static const CHAR cc_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" "Feature\tFeature\n" @@ -194,6 +201,14 @@ static const CHAR cc_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion "augustus\taugustus\taugustus\t50000\t\t\t16384\t2\n" "caesar\tcaesar\tcaesar\t500\t\t\t16384\t12"; +static const CHAR cc2_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "maximus\tmaximus\tmaximus\t500\t\t\t16384\t1\n" + "augustus\taugustus\taugustus\t50000\t\t\t16384\t2\n" + "tiberius\tmaximus\ttiberius\t500\t\t\t16384\t3\n" + "caesar\tcaesar\tcaesar\t500\t\t\t16384\t12"; + static const CHAR cc_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" "i2\ti4\tL64\tS255\tS32\tS72\n" "Media\tDiskId\n" @@ -624,6 +639,18 @@ static const msi_table cc_tables[] = ADD_TABLE(property), }; +static const msi_table cc2_tables[] = +{ + ADD_TABLE(cc2_component), + ADD_TABLE(directory), + ADD_TABLE(cc_feature), + ADD_TABLE(cc_feature_comp), + ADD_TABLE(cc2_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(cc_media), + ADD_TABLE(property), +}; + static const msi_table co_tables[] = { ADD_TABLE(cc_component), @@ -1538,6 +1565,49 @@ static void create_cc_test_files(void) DeleteFile("caesar"); } +static void create_cc2_test_files(void) +{ + CCAB cabParams; + HFCI hfci; + ERF erf; + static CHAR cab_context[] = "test%d.cab"; + BOOL res; + + create_file("maximus", 500); + create_file("augustus", 50000); + create_file("tiberius", 500); + create_file("caesar", 500); + + set_cab_parameters(&cabParams, "test1.cab", 40000); + + hfci = FCICreate(&erf, file_placed, mem_alloc, mem_free, fci_open, + fci_read, fci_write, fci_close, fci_seek, fci_delete, + get_temp_file, &cabParams, cab_context); + ok(hfci != NULL, "Failed to create an FCI context\n"); + + res = add_file(hfci, "maximus", tcompTYPE_NONE); + ok(res, "Failed to add file maximus\n"); + + res = add_file(hfci, "augustus", tcompTYPE_NONE); + ok(res, "Failed to add file augustus\n"); + + res = add_file(hfci, "tiberius", tcompTYPE_NONE); + ok(res, "Failed to add file tiberius\n"); + + res = FCIFlushCabinet(hfci, FALSE, get_next_cabinet, progress); + ok(res, "Failed to flush the cabinet\n"); + + res = FCIDestroy(hfci); + ok(res, "Failed to destroy the cabinet\n"); + + create_cab_file("test3.cab", MEDIA_SIZE, "caesar\0"); + + DeleteFile("maximus"); + DeleteFile("augustus"); + DeleteFile("tiberius"); + DeleteFile("caesar"); +} + static void delete_cab_files(void) { SHFILEOPSTRUCT shfl; @@ -1577,6 +1647,22 @@ static void test_continuouscabs(void) delete_cab_files(); DeleteFile(msifile); + + create_cc2_test_files(); + create_database(msifile, cc2_tables, sizeof(cc2_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); + ok(delete_pf("msitest\\tiberius", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + + delete_cab_files(); + DeleteFile(msifile); } static void test_caborder(void)

1 0

Rob Shearman : uuid: Add CLSID_InProcFreeMarshaler.
by Alexandre Julliard March 6, 2008

March 6, 2008

Module: wine Branch: master Commit: 630e273d17d63eaec8ab08c31056c731553fb2e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=630e273d17d63eaec8ab08c31… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Mar 6 15:02:00 2008 +0000 uuid: Add CLSID_InProcFreeMarshaler. Remove its initialisation from ole32. --- dlls/ole32/compobj_private.h | 1 - dlls/uuid/uuid.c | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 34d4cdb..5a954b9 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -43,7 +43,6 @@ typedef struct apartment APARTMENT; DEFINE_OLEGUID( CLSID_DfMarshal, 0x0000030b, 0, 0 ); DEFINE_OLEGUID( CLSID_PSFactoryBuffer, 0x00000320, 0, 0 ); -DEFINE_OLEGUID( CLSID_InProcFreeMarshaler, 0x0000033a, 0, 0 ); /* signal to stub manager that this is a rem unknown object */ #define MSHLFLAGSP_REMUNKNOWN 0x80000000 diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index b00a2a7..3fc97ee 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -102,3 +102,4 @@ DEFINE_GUID(CLSID_ComBinding, 0x00000328,0x0000,0x0000,0xc0,0x00,0x0 DEFINE_GUID(CLSID_StdEvent, 0x0000032b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_ManualResetEvent, 0x0000032c,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_SynchronizeContainer, 0x0000032d,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_InProcFreeMarshaler, 0x0000033a,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);

1 0

Rob Shearman : user32: Add test for calling CreateDesktop on already created desktop name.
by Alexandre Julliard March 6, 2008

March 6, 2008

Module: wine Branch: master Commit: 38a541186a6dd8e6a5721526416cdca0ffd7546e URL: http://source.winehq.org/git/wine.git/?a=commit;h=38a541186a6dd8e6a57215264… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Mar 6 15:01:48 2008 +0000 user32: Add test for calling CreateDesktop on already created desktop name. --- dlls/user32/tests/winstation.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index ac49d4a..16a1c93 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -220,6 +220,12 @@ static void test_handles(void) ok( !CloseWindowStation( (HWINSTA)d2 ), "CloseWindowStation succeeded on desktop\n" ); ok( GetLastError() == ERROR_INVALID_HANDLE, "bad last error %d\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + d3 = CreateDesktop( "foobar", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); + ok( d3 != 0, "create foobar desktop again failed\n" ); + ok( GetLastError() == 0xdeadbeef, "bad last error %d\n", GetLastError() ); + ok( CloseDesktop( d3 ), "CloseDesktop failed\n" ); + d3 = OpenDesktop( "foobar", 0, TRUE, DESKTOP_ALL_ACCESS ); ok( d3 != 0, "open foobar desktop failed\n" ); ok( d3 != d2, "open foobar desktop returned same handle\n" );

1 0

Rob Shearman : mshtml: Move some public GUIDs to shlguid.h.
by Alexandre Julliard March 6, 2008

March 6, 2008

Module: wine Branch: master Commit: 3b0ea978fddc6d12740ffe712927d829702da2fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b0ea978fddc6d12740ffe712… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Mar 6 15:01:17 2008 +0000 mshtml: Move some public GUIDs to shlguid.h. --- dlls/mshtml/main.c | 4 +--- include/shlguid.h | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 1c81c36..e69672f 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -36,6 +36,7 @@ #include "advpub.h" #include "shlwapi.h" #include "optary.h" +#include "shlguid.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -326,15 +327,12 @@ HRESULT WINAPI ShowHTMLDialog(HWND hwndParent, IMoniker *pMk, VARIANT *pvarArgIn return E_NOTIMPL; } -DEFINE_GUID(CLSID_CAnchorBrowsePropertyPage, 0x3050F3BB, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_CBackgroundPropertyPage, 0x3050F232, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_CCDAnchorPropertyPage, 0x3050F1FC, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_CCDGenericPropertyPage, 0x3050F17F, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); -DEFINE_GUID(CLSID_CDocBrowsePropertyPage, 0x3050F3B4, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_CDwnBindInfo, 0x3050F3C2, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_CHiFiUses, 0x5AAF51B3, 0xB1F0, 0x11D1, 0xB6,0xAB, 0x00,0xA0,0xC9,0x08,0x33,0xE9); DEFINE_GUID(CLSID_CHtmlComponentConstructor, 0x3050F4F8, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); -DEFINE_GUID(CLSID_CImageBrowsePropertyPage, 0x3050F3B3, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_CInlineStylePropertyPage, 0x3050F296, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_CPeerHandler, 0x5AAF51B2, 0xB1F0, 0x11D1, 0xB6,0xAB, 0x00,0xA0,0xC9,0x08,0x33,0xE9); DEFINE_GUID(CLSID_CRecalcEngine, 0x3050F499, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); diff --git a/include/shlguid.h b/include/shlguid.h index 503f4fc..23cce28 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -148,5 +148,8 @@ DEFINE_GUID(FMTID_Displaced, 0x9b174b33, 0x40ff, 0x11d2, 0xa2, 0x7e, 0x0, 0xc0, #define PID_DISPLACED_FROM 2 #define PID_DISPLACED_DATE 3 +DEFINE_GUID(CLSID_CAnchorBrowsePropertyPage, 0x3050F3BB, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); +DEFINE_GUID(CLSID_CDocBrowsePropertyPage, 0x3050F3B4, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); +DEFINE_GUID(CLSID_CImageBrowsePropertyPage, 0x3050F3B3, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); #endif /* __WINE_SHLGUID_H */

1 0

Huw Davies : ole32: Fix CopyTo to work correctly with LARGE_INTEGERs.
by Alexandre Julliard March 6, 2008

March 6, 2008

Module: wine Branch: master Commit: 0aedac346aaabfc1d78cd8c678f1cd3c48e74ace URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aedac346aaabfc1d78cd8c67… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 6 12:05:52 2008 +0000 ole32: Fix CopyTo to work correctly with LARGE_INTEGERs. --- dlls/ole32/hglobalstream.c | 41 +++++++++++------------------------------ 1 files changed, 11 insertions(+), 30 deletions(-) diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index 2175214..68a1527 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -467,24 +467,16 @@ static HRESULT WINAPI HGLOBALStreamImpl_CopyTo( TRACE("(%p, %p, %d, %p, %p)\n", iface, pstm, cb.u.LowPart, pcbRead, pcbWritten); - /* - * Sanity check - */ if ( pstm == 0 ) return STG_E_INVALIDPOINTER; - totalBytesRead.u.LowPart = totalBytesRead.u.HighPart = 0; - totalBytesWritten.u.LowPart = totalBytesWritten.u.HighPart = 0; + totalBytesRead.QuadPart = 0; + totalBytesWritten.QuadPart = 0; - /* - * use stack to store data temporarly - * there is surely more performant way of doing it, for now this basic - * implementation will do the job - */ - while ( cb.u.LowPart > 0 ) + while ( cb.QuadPart > 0 ) { - if ( cb.u.LowPart >= 128 ) - copySize = 128; + if ( cb.QuadPart >= sizeof(tmpBuffer) ) + copySize = sizeof(tmpBuffer); else copySize = cb.u.LowPart; @@ -492,7 +484,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_CopyTo( if (FAILED(hr)) break; - totalBytesRead.u.LowPart += bytesRead; + totalBytesRead.QuadPart += bytesRead; if (bytesRead) { @@ -500,29 +492,18 @@ static HRESULT WINAPI HGLOBALStreamImpl_CopyTo( if (FAILED(hr)) break; - totalBytesWritten.u.LowPart += bytesWritten; + totalBytesWritten.QuadPart += bytesWritten; } if (bytesRead!=copySize) - cb.u.LowPart = 0; + cb.QuadPart = 0; else - cb.u.LowPart -= bytesRead; + cb.QuadPart -= bytesRead; } - /* - * Update number of bytes read and written - */ - if (pcbRead) - { - pcbRead->u.LowPart = totalBytesRead.u.LowPart; - pcbRead->u.HighPart = totalBytesRead.u.HighPart; - } + if (pcbRead) pcbRead->QuadPart = totalBytesRead.QuadPart; + if (pcbWritten) pcbWritten->QuadPart = totalBytesWritten.QuadPart; - if (pcbWritten) - { - pcbWritten->u.LowPart = totalBytesWritten.u.LowPart; - pcbWritten->u.HighPart = totalBytesWritten.u.HighPart; - } return hr; }

1 0