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

Francois Gouget : winmm: Add full stops to some error messages.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: 74a75e479b8888d9e3ca6b6a0732a1b5b11ef829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74a75e479b8888d9e3ca6b6a0… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:23:33 2011 +0100 winmm: Add full stops to some error messages. --- dlls/winmm/winmm.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/winmm.rc b/dlls/winmm/winmm.rc index f529dff..6b5d800 100644 --- a/dlls/winmm/winmm.rc +++ b/dlls/winmm/winmm.rc @@ -39,7 +39,7 @@ MMSYSERR_INVALFLAG, "An invalid flag was passed to a system function." MMSYSERR_INVALPARAM, "An invalid parameter was passed to a system function." /* WAVE errors */ -WAVERR_BADFORMAT, "The specified format is not supported or cannot be translated. Use the Capabilities function to determine the supported formats" +WAVERR_BADFORMAT, "The specified format is not supported or cannot be translated. Use the Capabilities function to determine the supported formats." WAVERR_STILLPLAYING, "Cannot perform this operation while media data is still playing. Reset the device, or wait until the data is finished playing." WAVERR_UNPREPARED, "The wave header was not prepared. Use the Prepare function to prepare the header, and then try again." WAVERR_SYNC, "Cannot open the device without using the WAVE_ALLOWSYNC flag. Use the flag, and then try again." @@ -74,7 +74,7 @@ MCIERR_DEVICE_NOT_READY, "The device driver is not ready." MCIERR_INTERNAL, "A problem occurred in initializing MCI. Try restarting Windows." MCIERR_DRIVER, "There is a problem with the device driver. The driver has closed. Cannot access error." MCIERR_CANNOT_USE_ALL, "Cannot use 'all' as the device name with the specified command." -MCIERR_MULTIPLE, "Errors occurred in more than one device. Specify each command and device separately to determine which devices caused the error" +MCIERR_MULTIPLE, "Errors occurred in more than one device. Specify each command and device separately to determine which devices caused the error." MCIERR_EXTENSION_NOT_FOUND, "Cannot determine the device type from the given filename extension." MCIERR_OUTOFRANGE, "The specified parameter is out of range for the specified command." MCIERR_FLAGS_NOT_COMPATIBLE, "The specified parameters cannot be used together."

1 0

Francois Gouget : winecfg: Add a full stop to an error message.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: 11bbb80dc94e52d91b9e85f501978946713129b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11bbb80dc94e52d91b9e85f50… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:25:21 2011 +0100 winecfg: Add a full stop to an error message. --- programs/winecfg/winecfg.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index f98a14d..652fc47 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -83,7 +83,7 @@ BEGIN IDS_DRIVE_REMOTE "Network share" IDS_DRIVE_REMOVABLE "Floppy disk" IDS_DRIVE_CDROM "CD-ROM" - IDS_DRIVE_LETTERS_EXCEEDED "You cannot add any more drives.\n\nEach drive must have a letter, from A to Z, so you cannot have more than 26" + IDS_DRIVE_LETTERS_EXCEEDED "You cannot add any more drives.\n\nEach drive must have a letter, from A to Z, so you cannot have more than 26." IDS_SYSTEM_DRIVE_LABEL "System drive" IDS_CONFIRM_DELETE_C "Are you sure you want to delete drive C?\n\nMost Windows applications expect drive C to exist, and will die messily if it doesn't. If you proceed remember to recreate it!" IDS_COL_DRIVELETTER "Letter"

1 0

Roderick Colenbrander : wined3d: Add latest Nvidia GPUs.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: d003215ab4e54537440d77297588b4dd9f3ea9b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d003215ab4e54537440d77297… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Mar 15 22:07:40 2011 -0700 wined3d: Add latest Nvidia GPUs. --- dlls/wined3d/directx.c | 17 +++++++++++++++++ dlls/wined3d/wined3d_private.h | 7 +++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c5a9ef3..43f445e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1066,10 +1066,18 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT325M, "NVIDIA GeForce GT 325M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT330, "NVIDIA GeForce GT 330", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTS350M, "NVIDIA GeForce GTS 350M", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT420, "NVIDIA GeForce GT 420", DRIVER_NVIDIA_GEFORCE6, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT430, "NVIDIA GeForce GT 430", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT440, "NVIDIA GeForce GT 440", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTS450, "NVIDIA GeForce GTS 450", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX460, "NVIDIA GeForce GTX 460", DRIVER_NVIDIA_GEFORCE6, 768 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX465, "NVIDIA GeForce GTX 465", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX470, "NVIDIA GeForce GTX 470", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX480, "NVIDIA GeForce GTX 480", DRIVER_NVIDIA_GEFORCE6, 1536}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560, "NVIDIA GeForce GTX 560 TI", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX570, "NVIDIA GeForce GTX 570", DRIVER_NVIDIA_GEFORCE6, 1280}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX580, "NVIDIA GeForce GTX 580", DRIVER_NVIDIA_GEFORCE6, 1536}, + /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_7200, "ATI RADEON 7200 SERIES", DRIVER_AMD_R100, 32 }, @@ -1405,10 +1413,17 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl } cards[] = { + {"GTX 580", CARD_NVIDIA_GEFORCE_GTX580}, /* Geforce 500 - highend */ + {"GTX 570", CARD_NVIDIA_GEFORCE_GTX570}, /* Geforce 500 - midend high */ + {"GTX 560 TI", CARD_NVIDIA_GEFORCE_GTX560}, /* Geforce 500 - midend */ {"GTX 480", CARD_NVIDIA_GEFORCE_GTX480}, /* Geforce 400 - highend */ {"GTX 470", CARD_NVIDIA_GEFORCE_GTX470}, /* Geforce 400 - midend high */ {"GTX 465", CARD_NVIDIA_GEFORCE_GTX465}, /* Geforce 400 - midend */ {"GTX 460", CARD_NVIDIA_GEFORCE_GTX460}, /* Geforce 400 - midend */ + {"GTS 450", CARD_NVIDIA_GEFORCE_GTS450}, /* Geforce 400 - midend low */ + {"GT 440", CARD_NVIDIA_GEFORCE_GT440}, /* Geforce 400 - lowend */ + {"GT 430", CARD_NVIDIA_GEFORCE_GT430}, /* Geforce 400 - lowend */ + {"GT 420", CARD_NVIDIA_GEFORCE_GT420}, /* Geforce 400 - lowend */ {"GT 330", CARD_NVIDIA_GEFORCE_GT330}, /* Geforce 300 - highend */ {"GTS 360M", CARD_NVIDIA_GEFORCE_GTS350M}, /* Geforce 300 - highend mobile */ {"GTS 350M", CARD_NVIDIA_GEFORCE_GTS350M}, /* Geforce 300 - highend mobile */ @@ -1864,7 +1879,9 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i } cards[] = { + {"NVC8", CARD_NVIDIA_GEFORCE_GTX570}, {"NVC4", CARD_NVIDIA_GEFORCE_GTX460}, + {"NVC3", CARD_NVIDIA_GEFORCE_GT440}, {"NVC0", CARD_NVIDIA_GEFORCE_GTX480}, {"NVAF", CARD_NVIDIA_GEFORCE_GT320M}, {"NVAC", CARD_NVIDIA_GEFORCE_8200}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8726e2d..ec5c203 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1405,10 +1405,17 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GT325M = 0x0a35, CARD_NVIDIA_GEFORCE_GT330 = 0x0ca0, CARD_NVIDIA_GEFORCE_GTS350M = 0x0cb0, + CARD_NVIDIA_GEFORCE_GT420 = 0x0de2, + CARD_NVIDIA_GEFORCE_GT430 = 0x0de1, + CARD_NVIDIA_GEFORCE_GT440 = 0x0de0, + CARD_NVIDIA_GEFORCE_GTS450 = 0x0dc4, CARD_NVIDIA_GEFORCE_GTX460 = 0x0e22, CARD_NVIDIA_GEFORCE_GTX465 = 0x06c4, CARD_NVIDIA_GEFORCE_GTX470 = 0x06cd, CARD_NVIDIA_GEFORCE_GTX480 = 0x06c0, + CARD_NVIDIA_GEFORCE_GTX560 = 0x1200, + CARD_NVIDIA_GEFORCE_GTX570 = 0x1081, + CARD_NVIDIA_GEFORCE_GTX580 = 0x1080, CARD_INTEL_845G = 0x2562, CARD_INTEL_I830G = 0x3577,

1 0

Hans Leidekker : msi: Skip reference counting for assembly components.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: 12135acb70bb7a05b4421db89e31e95044452f82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12135acb70bb7a05b4421db89… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 16 09:22:48 2011 +0100 msi: Skip reference counting for assembly components. --- dlls/msi/action.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 7567f5d..f806f18 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3151,9 +3151,6 @@ static UINT ACTION_WriteSharedDLLsCount(LPCWSTR path, UINT count) return count; } -/* - * Return TRUE if the count should be written out and FALSE if not - */ static void ACTION_RefCountComponent( MSIPACKAGE* package, MSICOMPONENT *comp ) { MSIFEATURE *feature; @@ -3162,6 +3159,7 @@ static void ACTION_RefCountComponent( MSIPACKAGE* package, MSICOMPONENT *comp ) /* only refcount DLLs */ if (comp->KeyPath == NULL || + comp->assembly || comp->Attributes & msidbComponentAttributesRegistryKeyPath || comp->Attributes & msidbComponentAttributesODBCDataSource) write = FALSE;

1 0

Hans Leidekker : msi: Let the InstallFiles action determine which private assembly files to install .
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: bb40bebd2b62a8a6e8dd8fdf34aa8a3908a91a24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb40bebd2b62a8a6e8dd8fdf3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 16 09:22:59 2011 +0100 msi: Let the InstallFiles action determine which private assembly files to install. --- dlls/msi/assembly.c | 7 +++++-- dlls/msi/files.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index fcca6b8..ad5e3a5 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -282,8 +282,11 @@ MSIASSEMBLY *load_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) if (a->application) { - FIXME("we should probably check the manifest file here\n"); - a->installed = (msi_get_property_int( package->db, szInstalled, 0 ) != 0); + /* We can't check the manifest here because the target path may still change. + So we assume that the assembly is not installed and lean on the InstallFiles + action to determine which files need to be installed. + */ + a->installed = FALSE; } else { diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 7f71d1a..1f61873 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -74,7 +74,7 @@ static msi_file_state calculate_install_state( MSIFILE *file ) TRACE("file %s is not scheduled for install\n", debugstr_w(file->File)); return msifs_skipped; } - if ((comp->assembly && !comp->assembly->installed) || + if ((comp->assembly && !comp->assembly->application && !comp->assembly->installed) || GetFileAttributesW( file->TargetPath ) == INVALID_FILE_ATTRIBUTES) { TRACE("file %s is missing\n", debugstr_w(file->File));

1 0

Austin Lund : user32/tests: Output error information in cursoricon tests.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: 5d0783bc0d9149015fcbfd1375f64104d039ff0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d0783bc0d9149015fcbfd137… Author: Austin Lund <austin.lund(a)gmail.com> Date: Wed Mar 16 19:59:26 2011 +1000 user32/tests: Output error information in cursoricon tests. --- dlls/user32/tests/cursoricon.c | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 1127f13..d6a437d 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1452,7 +1452,7 @@ static void test_GetCursorFrameInfo(void) /* Creating a static cursor. */ SetLastError(0xdeadbeef); h1 = CreateIconFromResource((PBYTE) hotspot, CRSR_RES_SIZE, FALSE, 0x00030000); - ok(h1 != NULL, "Create cursor failed.\n"); + ok(h1 != NULL, "Create cursor failed (error = %d).\n", GetLastError()); /* Check GetCursorFrameInfo behavior on a static cursor */ unk1 = unk2 = unk3 = unk4 = 0xdead; @@ -1464,15 +1464,17 @@ static void test_GetCursorFrameInfo(void) ok(unk4 == 1, "GetCursorFrameInfo() unexpected param 5 value (%d != 1).\n", unk4); /* Clean up static cursor. */ + SetLastError(0xdeadbeef); ret = DestroyCursor(h1); - ok(ret, "DestroyCursor() failed.\n"); + ok(ret, "DestroyCursor() failed (error = %d).\n", GetLastError()); /* Creating a single-frame animated cursor. */ empty_anicursor.frames[0].data.icon_info.idType = 2; /* type: cursor */ empty_anicursor.frames[0].data.icon_info.idEntries[0].xHotspot = 3; empty_anicursor.frames[0].data.icon_info.idEntries[0].yHotspot = 3; + SetLastError(0xdeadbeef); h1 = CreateIconFromResource((PBYTE) &empty_anicursor, sizeof(empty_anicursor), FALSE, 0x00030000); - ok(h1 != NULL, "Create cursor failed.\n"); + ok(h1 != NULL, "Create cursor failed (error = %d).\n", GetLastError()); /* Check GetCursorFrameInfo behavior on a single-frame animated cursor */ unk1 = unk2 = unk3 = unk4 = 0xdead; @@ -1485,8 +1487,9 @@ static void test_GetCursorFrameInfo(void) "GetCursorFrameInfo() unexpected param 5 value (%d != 1).\n", unk4); /* Clean up single-frame animated cursor. */ + SetLastError(0xdeadbeef); ret = DestroyCursor(h1); - ok(ret, "DestroyCursor() failed.\n"); + ok(ret, "DestroyCursor() failed (error = %d).\n", GetLastError()); /* Creating a multi-frame animated cursor. */ for (i=0; i<empty_anicursor3.header.header.num_frames; i++) @@ -1495,8 +1498,9 @@ static void test_GetCursorFrameInfo(void) empty_anicursor3.frames[i].data.icon_info.idEntries[0].xHotspot = 3; empty_anicursor3.frames[i].data.icon_info.idEntries[0].yHotspot = 3; } + SetLastError(0xdeadbeef); h1 = CreateIconFromResource((PBYTE) &empty_anicursor3, sizeof(empty_anicursor3), FALSE, 0x00030000); - ok(h1 != NULL, "Create cursor failed.\n"); + ok(h1 != NULL, "Create cursor failed (error = %d).\n", GetLastError()); /* Check number of steps in multi-frame animated cursor */ i=0; @@ -1536,13 +1540,15 @@ static void test_GetCursorFrameInfo(void) "GetCursorFrameInfo() unexpected param 5 value (0x%x != 0xdead).\n", unk4); /* Clean up multi-frame animated cursor. */ + SetLastError(0xdeadbeef); ret = DestroyCursor(h1); - ok(ret, "DestroyCursor() failed.\n"); + ok(ret, "DestroyCursor() failed (error = %d).\n", GetLastError()); /* Create a multi-frame animated cursor with num_steps == 1 */ empty_anicursor3.header.header.num_steps = 1; + SetLastError(0xdeadbeef); h1 = CreateIconFromResource((PBYTE) &empty_anicursor3, sizeof(empty_anicursor3), FALSE, 0x00030000); - ok(h1 != NULL, "Create cursor failed.\n"); + ok(h1 != NULL, "Create cursor failed (error = %d).\n", GetLastError()); /* Check number of steps in multi-frame animated cursor (mismatch between steps and frames) */ i=0; @@ -1578,8 +1584,9 @@ static void test_GetCursorFrameInfo(void) "GetCursorFrameInfo() unexpected param 5 value (%d != 0xdead).\n", unk4); /* Clean up multi-frame animated cursor. */ + SetLastError(0xdeadbeef); ret = DestroyCursor(h1); - ok(ret, "DestroyCursor() failed.\n"); + ok(ret, "DestroyCursor() failed (error = %d).\n", GetLastError()); /* Creating a multi-frame animated cursor with rate data. */ for (i=0; i<empty_anicursor3_rate.header.header.num_frames; i++) @@ -1588,8 +1595,9 @@ static void test_GetCursorFrameInfo(void) empty_anicursor3_rate.frames[i].data.icon_info.idEntries[0].xHotspot = 3; empty_anicursor3_rate.frames[i].data.icon_info.idEntries[0].yHotspot = 3; } + SetLastError(0xdeadbeef); h1 = CreateIconFromResource((PBYTE) &empty_anicursor3_rate, sizeof(empty_anicursor3_rate), FALSE, 0x00030000); - ok(h1 != NULL, "Create cursor failed.\n"); + ok(h1 != NULL, "Create cursor failed (error = %x).\n", GetLastError()); /* Check number of steps in multi-frame animated cursor with rate data */ i=0; @@ -1616,8 +1624,9 @@ static void test_GetCursorFrameInfo(void) } /* Clean up multi-frame animated cursor with rate data. */ + SetLastError(0xdeadbeef); ret = DestroyCursor(h1); - ok(ret, "DestroyCursor() failed.\n"); + ok(ret, "DestroyCursor() failed (error = %d).\n", GetLastError()); cleanup: if(bmpOld) SelectObject(hdc, bmpOld);

1 0

Nikolay Sivov : msxml3: Merge save() tests to a single function.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: 59f64b2896cfed6a0d00553cb1c4db6cf5b1be8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=59f64b2896cfed6a0d00553cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 15 23:26:55 2011 +0300 msxml3: Merge save() tests to a single function. --- dlls/msxml3/tests/domdoc.c | 103 ++++++++++++++++---------------------------- 1 files changed, 37 insertions(+), 66 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 108d610..6948201 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5629,10 +5629,15 @@ static void test_nodeTypeTests( void ) free_bstrs(); } -static void test_DocumentSaveToDocument(void) +static void test_save(void) { IXMLDOMDocument *doc, *doc2; - IXMLDOMElement *pRoot; + IXMLDOMElement *root; + VARIANT file, vDoc; + BSTR sOrig, sNew; + char buffer[100]; + DWORD read = 0; + HANDLE hfile; HRESULT hr; doc = create_document(&IID_IXMLDOMDocument); @@ -5645,86 +5650,53 @@ static void test_DocumentSaveToDocument(void) return; } - hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &pRoot); - ok(hr == S_OK, "ret %08x\n", hr ); - if(hr == S_OK) - { - hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)pRoot, NULL); - ok(hr == S_OK, "ret %08x\n", hr ); - if(hr == S_OK) - { - VARIANT vDoc; - BSTR sOrig; - BSTR sNew; - - V_VT(&vDoc) = VT_UNKNOWN; - V_UNKNOWN(&vDoc) = (IUnknown*)doc2; - - hr = IXMLDOMDocument_save(doc, vDoc); - ok(hr == S_OK, "ret %08x\n", hr ); + /* save to IXMLDOMDocument */ + hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &root); + EXPECT_HR(hr, S_OK); - hr = IXMLDOMDocument_get_xml(doc, &sOrig); - ok(hr == S_OK, "ret %08x\n", hr ); + hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)root, NULL); + EXPECT_HR(hr, S_OK); - hr = IXMLDOMDocument_get_xml(doc2, &sNew); - ok(hr == S_OK, "ret %08x\n", hr ); + V_VT(&vDoc) = VT_UNKNOWN; + V_UNKNOWN(&vDoc) = (IUnknown*)doc2; - ok( !lstrcmpW( sOrig, sNew ), "New document is not the same as origial\n"); + hr = IXMLDOMDocument_save(doc, vDoc); + EXPECT_HR(hr, S_OK); - SysFreeString(sOrig); - SysFreeString(sNew); - } - IXMLDOMElement_Release(pRoot); - } + hr = IXMLDOMDocument_get_xml(doc, &sOrig); + EXPECT_HR(hr, S_OK); - IXMLDOMDocument_Release(doc2); - IXMLDOMDocument_Release(doc); -} + hr = IXMLDOMDocument_get_xml(doc2, &sNew); + EXPECT_HR(hr, S_OK); -static void test_DocumentSaveToFile(void) -{ - IXMLDOMDocument *doc; - IXMLDOMElement *pRoot; - HANDLE file; - char buffer[100]; - DWORD read = 0; - HRESULT hr; + ok( !lstrcmpW( sOrig, sNew ), "New document is not the same as origial\n"); - doc = create_document(&IID_IXMLDOMDocument); - if (!doc) return; + SysFreeString(sOrig); + SysFreeString(sNew); - hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &pRoot); - ok(hr == S_OK, "ret %08x\n", hr ); - if(hr == S_OK) - { - hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)pRoot, NULL); - ok(hr == S_OK, "ret %08x\n", hr ); - if(hr == S_OK) - { - VARIANT vFile; + IXMLDOMElement_Release(root); + IXMLDOMDocument_Release(doc2); - V_VT(&vFile) = VT_BSTR; - V_BSTR(&vFile) = _bstr_("test.xml"); + /* save to path */ + V_VT(&file) = VT_BSTR; + V_BSTR(&file) = _bstr_("test.xml"); - hr = IXMLDOMDocument_save(doc, vFile); - ok(hr == S_OK, "ret %08x\n", hr ); - } - } + hr = IXMLDOMDocument_save(doc, file); + EXPECT_HR(hr, S_OK); - IXMLDOMElement_Release(pRoot); IXMLDOMDocument_Release(doc); - file = CreateFile("test.xml", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); - ok(file != INVALID_HANDLE_VALUE, "Could not open file: %u\n", GetLastError()); - if(file == INVALID_HANDLE_VALUE) - return; + hfile = CreateFile("test.xml", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); + ok(hfile != INVALID_HANDLE_VALUE, "Could not open file: %u\n", GetLastError()); + if(hfile == INVALID_HANDLE_VALUE) return; - ReadFile(file, buffer, sizeof(buffer), &read, NULL); + ReadFile(hfile, buffer, sizeof(buffer), &read, NULL); ok(read != 0, "could not read file\n"); ok(buffer[0] != '<' || buffer[1] != '?', "File contains processing instruction\n"); - CloseHandle(file); + CloseHandle(hfile); DeleteFile("test.xml"); + free_bstrs(); } static void test_testTransforms(void) @@ -8678,8 +8650,7 @@ START_TEST(domdoc) test_cloneNode(); test_xmlTypes(); test_nodeTypeTests(); - test_DocumentSaveToDocument(); - test_DocumentSaveToFile(); + test_save(); test_testTransforms(); test_Namespaces(); test_FormattingXML();

1 0

Łukasz Wojniłowicz : po: Update Polish translation.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: 0a4c91d73c3a7fc852f0277771e19f44c2cf414a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a4c91d73c3a7fc852f027777… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Tue Mar 15 12:49:41 2011 +0100 po: Update Polish translation. --- po/pl.po | 657 ++++++++++++++++++------------------------------------------- 1 files changed, 194 insertions(+), 463 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a4c91d73c3a7fc852f02…

1 0

Nikolay Sivov : msxml3: Support VT_BSTR|VT_BYREF as source in load().
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: cde8e6c8cc69ca0b3542779a5cdf5e88475c7465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde8e6c8cc69ca0b3542779a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 16 00:35:55 2011 +0300 msxml3: Support VT_BSTR|VT_BYREF as source in load(). --- dlls/msxml3/domdoc.c | 24 ++++++++++-------- dlls/msxml3/main.c | 3 ++ dlls/msxml3/tests/domdoc.c | 57 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 71 insertions(+), 13 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 7d1b352..43bcb77 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2104,7 +2104,7 @@ static HRESULT doread( domdoc *This, LPWSTR filename ) static HRESULT WINAPI domdoc_load( IXMLDOMDocument3 *iface, - VARIANT xmlSource, + VARIANT source, VARIANT_BOOL* isSuccessful ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); @@ -2114,19 +2114,23 @@ static HRESULT WINAPI domdoc_load( IStream *pStream = NULL; xmlDocPtr xmldoc; - TRACE("(%p)->type %d\n", This, V_VT(&xmlSource) ); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&source)); *isSuccessful = VARIANT_FALSE; assert( &This->node ); - switch( V_VT(&xmlSource) ) + switch( V_VT(&source) ) { case VT_BSTR: - filename = V_BSTR(&xmlSource); + filename = V_BSTR(&source); + break; + case VT_BSTR|VT_BYREF: + if (!V_BSTRREF(&source)) return E_INVALIDARG; + filename = *V_BSTRREF(&source); break; case VT_UNKNOWN: - hr = IUnknown_QueryInterface(V_UNKNOWN(&xmlSource), &IID_IXMLDOMDocument3, (void**)&pNewDoc); + hr = IUnknown_QueryInterface(V_UNKNOWN(&source), &IID_IXMLDOMDocument3, (void**)&pNewDoc); if(hr == S_OK) { if(pNewDoc) @@ -2141,7 +2145,7 @@ static HRESULT WINAPI domdoc_load( return hr; } } - hr = IUnknown_QueryInterface(V_UNKNOWN(&xmlSource), &IID_IStream, (void**)&pStream); + hr = IUnknown_QueryInterface(V_UNKNOWN(&source), &IID_IStream, (void**)&pStream); if(hr == S_OK) { IPersistStream *pDocStream; @@ -2170,14 +2174,12 @@ static HRESULT WINAPI domdoc_load( else { /* ISequentialStream */ - FIXME("Unknown type not supported (%d) (%p)(%p)\n", hr, pNewDoc, V_UNKNOWN(&xmlSource)->lpVtbl); + FIXME("Unknown type not supported (%d) (%p)(%p)\n", hr, pNewDoc, V_UNKNOWN(&source)->lpVtbl); } break; default: - FIXME("VT type not supported (%d)\n", V_VT(&xmlSource)); - } - - TRACE("filename (%s)\n", debugstr_w(filename)); + FIXME("VT type not supported (%d)\n", V_VT(&source)); + } if ( filename ) { diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 6cbdd99..01eabab 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -286,6 +286,9 @@ const char *debugstr_variant(const VARIANT *v) return wine_dbg_sprintf("{VT_UNKNOWN: %p}", V_UNKNOWN(v)); case VT_UINT: return wine_dbg_sprintf("{VT_UINT: %u}", V_UINT(v)); + case VT_BSTR|VT_BYREF: + return wine_dbg_sprintf("{VT_BSTR|VT_BYREF: ptr %p, data %s}", + V_BSTRREF(v), V_BSTRREF(v) ? debugstr_w(*V_BSTRREF(v)) : NULL); default: return wine_dbg_sprintf("{vt %d}", V_VT(v)); } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 6948201..3e60e24 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5686,7 +5686,7 @@ static void test_save(void) IXMLDOMDocument_Release(doc); - hfile = CreateFile("test.xml", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); + hfile = CreateFileA("test.xml", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); ok(hfile != INVALID_HANDLE_VALUE, "Could not open file: %u\n", GetLastError()); if(hfile == INVALID_HANDLE_VALUE) return; @@ -6097,7 +6097,7 @@ static void test_TransformWithLoadingLocalFile(void) GetTempPathA(MAX_PATH, lpPathBuffer); strcat(lpPathBuffer, "customers.xml" ); - file = CreateFile(lpPathBuffer, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); + file = CreateFileA(lpPathBuffer, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); ok(file != INVALID_HANDLE_VALUE, "Could not create file: %u\n", GetLastError()); if(file == INVALID_HANDLE_VALUE) return; @@ -8609,6 +8609,58 @@ static void test_selection(void) free_bstrs(); } +static void test_load(void) +{ + IXMLDOMDocument *doc; + VARIANT_BOOL b; + HANDLE hfile; + VARIANT src; + HRESULT hr; + BOOL ret; + BSTR path; + DWORD written; + + /* prepare a file */ + hfile = CreateFileA("test.xml", GENERIC_WRITE|GENERIC_READ, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); + ok(hfile != INVALID_HANDLE_VALUE, "failed to create test file\n"); + if(hfile == INVALID_HANDLE_VALUE) return; + + ret = WriteFile(hfile, szNonUnicodeXML, sizeof(szNonUnicodeXML)-1, &written, NULL); + ok(ret, "WriteFile failed\n"); + + CloseHandle(hfile); + + doc = create_document(&IID_IXMLDOMDocument); + + path = _bstr_("test.xml"); + + /* load from path: VT_BSTR */ + V_VT(&src) = VT_BSTR; + V_BSTR(&src) = path; + hr = IXMLDOMDocument_load(doc, src, &b); + EXPECT_HR(hr, S_OK); + ok(b == VARIANT_TRUE, "got %d\n", b); + + /* load from a path: VT_BSTR|VT_BYREF */ + V_VT(&src) = VT_BSTR | VT_BYREF; + V_BSTRREF(&src) = &path; + hr = IXMLDOMDocument_load(doc, src, &b); + EXPECT_HR(hr, S_OK); + ok(b == VARIANT_TRUE, "got %d\n", b); + + /* load from a path: VT_BSTR|VT_BYREF, null ptr */ + V_VT(&src) = VT_BSTR | VT_BYREF; + V_BSTRREF(&src) = NULL; + hr = IXMLDOMDocument_load(doc, src, &b); + EXPECT_HR(hr, E_INVALIDARG); + ok(b == VARIANT_FALSE, "got %d\n", b); + + IXMLDOMDocument_Release(doc); + + DeleteFileA("test.xml"); + free_bstrs(); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -8680,6 +8732,7 @@ START_TEST(domdoc) test_get_nodeTypeString(); test_get_attributes(); test_selection(); + test_load(); test_xsltemplate();

1 0

Huw Davies : include: Uncomment EMRGRADIENTFILL.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: 58442c1b50e11644924779f5cf2ac149e4fdd851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58442c1b50e11644924779f5c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 16 10:07:40 2011 +0000 include: Uncomment EMRGRADIENTFILL. --- include/wingdi.h | 86 +++++++++++++++++++++++++++--------------------------- 1 files changed, 43 insertions(+), 43 deletions(-) diff --git a/include/wingdi.h b/include/wingdi.h index 29fb351..ca6df30 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -1966,6 +1966,49 @@ typedef struct #define STOCK_LAST 19 #define CLR_INVALID 0xffffffff + +typedef USHORT COLOR16; + +typedef struct _TRIVERTEX +{ + LONG x; + LONG y; + COLOR16 Red; + COLOR16 Green; + COLOR16 Blue; + COLOR16 Alpha; +} TRIVERTEX, *PTRIVERTEX, *LPTRIVERTEX; + +typedef struct _GRADIENT_TRIANGLE +{ + ULONG Vertex1; + ULONG Vertex2; + ULONG Vertex3; +} GRADIENT_TRIANGLE, *PGRADIENT_TRIANGLE, *LPGRADIENT_TRIANGLE; + +typedef struct _GRADIENT_RECT +{ + ULONG UpperLeft; + ULONG LowerRight; +} GRADIENT_RECT, *PGRADIENT_RECT, *LPGRADIENT_RECT; + +#define AC_SRC_OVER 0x00 +#define AC_SRC_ALPHA 0x01 + +typedef struct _BLENDFUNCTION +{ + BYTE BlendOp; + BYTE BlendFlags; + BYTE SourceConstantAlpha; + BYTE AlphaFormat; +} BLENDFUNCTION, *PBLENDFUNCTION; + +#define GRADIENT_FILL_RECT_H 0x00000000 +#define GRADIENT_FILL_RECT_V 0x00000001 +#define GRADIENT_FILL_TRIANGLE 0x00000002 +#define GRADIENT_FILL_OP_FLAG 0x000000ff + + /* Metafile header structure */ #include <pshpack2.h> typedef struct @@ -2347,7 +2390,6 @@ typedef struct { BYTE Data[1]; } EMRGDICOMMENT, *PEMRGDICOMMENT; -#if 0 typedef struct { EMR emr; RECTL rclBounds; @@ -2356,7 +2398,6 @@ typedef struct { ULONG ulMode; TRIVERTEX Ver[1]; } EMRGRADIENTFILL, *PEMRGRADIENTFILL; -#endif typedef struct { EMR emr; @@ -3255,47 +3296,6 @@ DECL_WINELIB_TYPE_AW(LPDISPLAY_DEVICE) #define DISPLAY_DEVICE_MIRRORING_DRIVER 0x00000008 #define DISPLAY_DEVICE_VGA_COMPATIBLE 0x00000010 -typedef USHORT COLOR16; - -typedef struct _TRIVERTEX -{ - LONG x; - LONG y; - COLOR16 Red; - COLOR16 Green; - COLOR16 Blue; - COLOR16 Alpha; -} TRIVERTEX, *PTRIVERTEX, *LPTRIVERTEX; - -typedef struct _GRADIENT_TRIANGLE -{ - ULONG Vertex1; - ULONG Vertex2; - ULONG Vertex3; -} GRADIENT_TRIANGLE, *PGRADIENT_TRIANGLE, *LPGRADIENT_TRIANGLE; - -typedef struct _GRADIENT_RECT -{ - ULONG UpperLeft; - ULONG LowerRight; -} GRADIENT_RECT, *PGRADIENT_RECT, *LPGRADIENT_RECT; - -#define AC_SRC_OVER 0x00 -#define AC_SRC_ALPHA 0x01 - -typedef struct _BLENDFUNCTION -{ - BYTE BlendOp; - BYTE BlendFlags; - BYTE SourceConstantAlpha; - BYTE AlphaFormat; -} BLENDFUNCTION, *PBLENDFUNCTION; - -#define GRADIENT_FILL_RECT_H 0x00000000 -#define GRADIENT_FILL_RECT_V 0x00000001 -#define GRADIENT_FILL_TRIANGLE 0x00000002 -#define GRADIENT_FILL_OP_FLAG 0x000000ff - #define GDI_ERROR (~0u) #define HGDI_ERROR ((HANDLE)~(ULONG_PTR)0)

1 0