January 2007 - Wine-commits

Vitaly Lipatov : comdlg32: Update Russian translation.
by Alexandre Julliard 25 Jan '07

25 Jan '07

Module: wine Branch: master Commit: d801fb69121f025ce3b9057b60c6c49c0ca6547c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d801fb69121f025ce3b9057b6… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Thu Jan 25 13:16:34 2007 +0300 comdlg32: Update Russian translation. --- dlls/comdlg32/cdlg_Ru.rc | 38 ++++++++++++++++++++++++++++++++++---- 1 files changed, 34 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/cdlg_Ru.rc b/dlls/comdlg32/cdlg_Ru.rc index 425346e..8514e62 100644 --- a/dlls/comdlg32/cdlg_Ru.rc +++ b/dlls/comdlg32/cdlg_Ru.rc @@ -399,14 +399,14 @@ STRINGTABLE DISCARDABLE PD32_TOO_LARGE_COPIES "�� \ �� .\n�� 1 � %d" PD32_PRINT_ERROR "�� " - PD32_NO_DEFAULT_PRINTER "�� , �� " + PD32_NO_DEFAULT_PRINTER "�� , �� " PD32_CANT_FIND_PRINTER "�� " PD32_OUT_OF_MEMORY "�� " PD32_GENERIC_ERROR "��(�) ��(�)" PD32_DRIVER_UNKNOWN "�� " - PD32_NO_DEVICES "Before you can perform printer-related tasks \ -such as page setup or printing a document, you need to install a printer. \ -Please install one and retry." + PD32_NO_DEVICES "�� . \ +��, �� . \ +" PD32_DEFAULT_PRINTER "�� ; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "%d �� " @@ -441,3 +441,33 @@ Please install one and retry." PD32_PRINTER_STATUS_SERVER_UNKNOWN "�� ; " PD32_PRINTER_STATUS_POWER_SAVE "�� ; " } + +STRINGTABLE DISCARDABLE /* Color names */ +{ + IDS_COLOR_BLACK "׸��" + IDS_COLOR_MAROON "Ҹ��-��" + IDS_COLOR_GREEN "��" + IDS_COLOR_OLIVE "��" + IDS_COLOR_NAVY "Ҹ��-��" + IDS_COLOR_PURPLE "��" + IDS_COLOR_TEAL "�� " + IDS_COLOR_GRAY "��" + IDS_COLOR_SILVER "��" + IDS_COLOR_RED "��" + IDS_COLOR_LIME "��" + IDS_COLOR_YELLOW "Ƹ��" + IDS_COLOR_BLUE "��" + IDS_COLOR_FUCHSIA "��-��" + IDS_COLOR_AQUA "��" + IDS_COLOR_WHITE "��" +} + +STRINGTABLE DISCARDABLE +{ + IDS_FONT_SIZE "�� %d - %d ��." + IDS_SAVE_BUTTON "&��" + IDS_SAVE_IN "�� &�:" + IDS_SAVE "��" + IDS_SAVE_AS "�� " + IDS_OPEN_FILE "�� " +}

1 0

Mike McCormack : msi: Add a test for the IMsiServer interface.
by Alexandre Julliard 25 Jan '07

25 Jan '07

Module: wine Branch: master Commit: d316c19741b668ee324311c99ef97e73a7f45adc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d316c19741b668ee324311c99… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jan 25 18:56:29 2007 +0900 msi: Add a test for the IMsiServer interface. --- dlls/msi/tests/Makefile.in | 2 + dlls/msi/tests/iface.c | 202 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 204 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in index df31296..885c174 100644 --- a/dlls/msi/tests/Makefile.in +++ b/dlls/msi/tests/Makefile.in @@ -4,10 +4,12 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = msi.dll IMPORTS = cabinet msi shell32 ole32 advapi32 kernel32 +EXTRALIBS = -luuid CTESTS = \ db.c \ format.c \ + iface.c \ install.c \ msi.c \ package.c \ diff --git a/dlls/msi/tests/iface.c b/dlls/msi/tests/iface.c new file mode 100644 index 0000000..556e6f5 --- /dev/null +++ b/dlls/msi/tests/iface.c @@ -0,0 +1,202 @@ +/* + * tests for Microsoft Installer functionality + * + * Copyright 2007 Mike McCormack for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdio.h> +#include <windows.h> +#include <msi.h> +#include <msiquery.h> +#include <ole2.h> + +#include "wine/test.h" + +static GUID CLSID_IInstaller = { 0xc1090, 0, 0, {0xc0,0,0,0,0,0,0,0x46} }; +static GUID IID_IMsiServer = { 0xc101c, 0, 0, {0xc0,0,0,0,0,0,0,0x46} }; + +static DISPID get_dispid( IDispatch *disp, const char *name ) +{ + LPOLESTR str; + UINT len; + DISPID id; + HRESULT r; + + len = MultiByteToWideChar(CP_ACP, 0, name, -1, NULL, 0 ); + str = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR) ); + len = MultiByteToWideChar(CP_ACP, 0, name, -1, str, len ); + + r = IDispatch_GetIDsOfNames( disp, &IID_IMsiServer, &str, 1, 0, &id ); + if (r != S_OK) + return -1; + + return id; +} + +static void test_msi_dispid(void) +{ + HRESULT r; + IDispatch *disp = NULL; + + r = CoCreateInstance( &CLSID_IInstaller, NULL, CLSCTX_INPROC_SERVER, + &IID_IDispatch, (LPVOID*) &disp ); + todo_wine ok( r == S_OK, "failed to create an installer instance %08x\n", r); + if (r != S_OK) + { + skip( "IMsiServer interface not present\n"); + return; + } + + ok( get_dispid( disp, "OpenPackage" ) == 2, "dispid wrong\n"); + ok( get_dispid( disp, "OpenProduct" ) == 3, "dispid wrong\n"); + ok( get_dispid( disp, "OpenDatabase" ) == 4, "dispid wrong\n"); + ok( get_dispid( disp, "SummaryInformation" ) == 5, "dispid wrong\n"); + ok( get_dispid( disp, "UILevel" ) == 6, "dispid wrong\n"); + ok( get_dispid( disp, "EnableLog" ) == 7, "dispid wrong\n"); + ok( get_dispid( disp, "InstallProduct" ) == 8, "dispid wrong\n"); + ok( get_dispid( disp, "Version" ) == 9, "dispid wrong\n"); + ok( get_dispid( disp, "LastErrorRecord" ) == 10, "dispid wrong\n"); + ok( get_dispid( disp, "RegistryValue" ) == 11, "dispid wrong\n"); + ok( get_dispid( disp, "Environment" ) == 12, "dispid wrong\n"); + ok( get_dispid( disp, "FileAttributes" ) == 13, "dispid wrong\n"); + + ok( get_dispid( disp, "FileSize" ) == 15, "dispid wrong\n"); + ok( get_dispid( disp, "FileVersion" ) == 16, "dispid wrong\n"); + ok( get_dispid( disp, "ProductState" ) == 17, "dispid wrong\n"); + ok( get_dispid( disp, "ProductInfo" ) == 18, "dispid wrong\n"); + ok( get_dispid( disp, "ConfigureProduct" ) == 19, "dispid wrong\n"); + ok( get_dispid( disp, "ReinstallProduct" ) == 20 , "dispid wrong\n"); + ok( get_dispid( disp, "CollectUserInfo" ) == 21, "dispid wrong\n"); + ok( get_dispid( disp, "ApplyPatch" ) == 22, "dispid wrong\n"); + ok( get_dispid( disp, "FeatureParent" ) == 23, "dispid wrong\n"); + ok( get_dispid( disp, "FeatureState" ) == 24, "dispid wrong\n"); + ok( get_dispid( disp, "UseFeature" ) == 25, "dispid wrong\n"); + ok( get_dispid( disp, "FeatureUsageCount" ) == 26, "dispid wrong\n"); + ok( get_dispid( disp, "FeatureUsageDate" ) == 27, "dispid wrong\n"); + ok( get_dispid( disp, "ConfigureFeature" ) == 28, "dispid wrong\n"); + ok( get_dispid( disp, "ReinstallFeature" ) == 29, "dispid wrong\n"); + ok( get_dispid( disp, "ProvideComponent" ) == 30, "dispid wrong\n"); + ok( get_dispid( disp, "ComponentPath" ) == 31, "dispid wrong\n"); + ok( get_dispid( disp, "ProvideQualifiedComponent" ) == 32, "dispid wrong\n"); + ok( get_dispid( disp, "QualifierDescription" ) == 33, "dispid wrong\n"); + ok( get_dispid( disp, "ComponentQualifiers" ) == 34, "dispid wrong\n"); + ok( get_dispid( disp, "Products" ) == 35, "dispid wrong\n"); + ok( get_dispid( disp, "Features" ) == 36, "dispid wrong\n"); + ok( get_dispid( disp, "Components" ) == 37, "dispid wrong\n"); + ok( get_dispid( disp, "ComponentClients" ) == 38, "dispid wrong\n"); + ok( get_dispid( disp, "Patches" ) == 39, "dispid wrong\n"); + ok( get_dispid( disp, "RelatedProducts" ) == 40, "dispid wrong\n"); + ok( get_dispid( disp, "PatchInfo" ) == 41, "dispid wrong\n"); + ok( get_dispid( disp, "PatchTransforms" ) == 42, "dispid wrong\n"); + ok( get_dispid( disp, "AddSource" ) == 43, "dispid wrong\n"); + ok( get_dispid( disp, "ClearSourceList" ) == 44, "dispid wrong\n"); + ok( get_dispid( disp, "ForceSourceListResolution" ) == 45, "dispid wrong\n"); + ok( get_dispid( disp, "ShortcutTarget" ) == 46, "dispid wrong\n"); + ok( get_dispid( disp, "FileHash" ) == 47, "dispid wrong\n"); + ok( get_dispid( disp, "FileSignatureInfo" ) == 48, "dispid wrong\n"); + ok( get_dispid( disp, "RemovePatches" ) == 49, "dispid wrong\n"); + + ok( get_dispid( disp, "ApplyMultiplePatches" ) == 51, "dispid wrong\n"); + ok( get_dispid( disp, "ProductsEx" ) == 52, "dispid wrong\n"); + + ok( get_dispid( disp, "PatchesEx" ) == 55, "dispid wrong\n"); + + ok( get_dispid( disp, "ExtractPatchXMLData" ) == 57, "dispid wrong\n"); + + /* MSDN claims the following functions exist but IDispatch->GetIDsOfNames disagrees */ + if (0) + { + get_dispid( disp, "ProductElevated" ); + get_dispid( disp, "ProductInfoFromScript" ); + get_dispid( disp, "ProvideAssembly" ); + get_dispid( disp, "CreateAdvertiseScript" ); + get_dispid( disp, "AdvertiseProduct" ); + get_dispid( disp, "PatchFiles" ); + } + + IDispatch_Release( disp ); +} + +static void test_msi_invoke(void) +{ + IDispatch *installer = NULL, *record = NULL; + DISPPARAMS param; + VARIANTARG varg; + VARIANT result; + DISPID dispid; + DISPID arg; + HRESULT r; + + r = CoCreateInstance( &CLSID_IInstaller, NULL, CLSCTX_INPROC_SERVER, + &IID_IDispatch, (LPVOID*) &installer ); + todo_wine ok( r == S_OK, "failed to create an installer instance %08x\n", r); + if (r != S_OK) + { + skip( "IMsiServer interface not present\n"); + return; + } + + arg = 0; + + V_UINT(&varg) = 1; + V_VT(&varg) = VT_I4; + + param.cArgs = 1; + param.cNamedArgs = 0; + param.rgvarg = &varg; + param.rgdispidNamedArgs = &arg; + + dispid = get_dispid( installer, "CreateRecord" ); + + r = IDispatch_Invoke( installer, dispid, &IID_NULL, 0, + DISPATCH_METHOD, &param, &result, NULL, NULL); + ok( r == S_OK, "dispatch failed %08x\n", r); + + ok( V_VT(&result) == VT_DISPATCH, "type wrong\n"); + + record = V_DISPATCH(&result); + + memset( &result, 0, sizeof result ); + dispid = get_dispid( record, "FieldCount" ); + + param.cArgs = 0; + param.cNamedArgs = 0; + param.rgvarg = &varg; + param.rgdispidNamedArgs = &arg; + + r = IDispatch_Invoke( record, dispid, &IID_NULL, 0, + DISPATCH_PROPERTYGET, &param, &result, NULL, NULL ); + ok( r == S_OK, "dispatch failed %08x\n", r); + + ok( V_VT(&result) == VT_I4, "type wrong\n"); + ok( V_I4(&result) == 1, "field count wrong\n"); + + IDispatch_Release( record ); + IDispatch_Release( installer ); +} + +START_TEST(iface) +{ + CoInitialize( NULL ); + + test_msi_dispid(); + test_msi_invoke(); + + CoUninitialize(); +}

1 0

Jan Zerebecki : urlmon: Fix type of an empty string to avoid warning.
by Alexandre Julliard 25 Jan '07

25 Jan '07

Module: wine Branch: master Commit: 85410f2ac16f5f81074deb93469e51262b1a807e URL: http://source.winehq.org/git/wine.git/?a=commit;h=85410f2ac16f5f81074deb934… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Wed Jan 24 19:38:32 2007 +0100 urlmon: Fix type of an empty string to avoid warning. --- dlls/urlmon/tests/protocol.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 81c3757..5a40355 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -564,7 +564,7 @@ static HRESULT WINAPI Protocol_Start(IIn HRESULT hres; static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; - static const WCHAR empty_str = {0}; + static const WCHAR empty_str[] = {0}; CHECK_EXPECT(Start); @@ -592,7 +592,7 @@ static HRESULT WINAPI Protocol_Start(IIn SET_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); hres = IInternetProtocolSink_ReportProgress(pOIProtSink, - BINDSTATUS_CACHEFILENAMEAVAILABLE, expect_wsz = &empty_str); + BINDSTATUS_CACHEFILENAMEAVAILABLE, expect_wsz = empty_str); ok(hres == S_OK, "ReportProgress(BINDSTATUS_CACHEFILENAMEAVAILABLE) failed: %08x\n", hres); CHECK_CALLED(ReportProgress_CACHEFILENAMEAVAILABLE);

1 0

Ken Thomases : winex11.drv: Copy the GL extensions string because it may be freed.
by Alexandre Julliard 25 Jan '07

25 Jan '07

Module: wine Branch: master Commit: a790ff55686cdf957903d3d9252909322a85bea2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a790ff55686cdf957903d3d92… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jan 24 23:51:24 2007 -0600 winex11.drv: Copy the GL extensions string because it may be freed. --- dlls/winex11.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index ebc980e..aaeb0a3 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -305,7 +305,7 @@ static BOOL X11DRV_WineGL_InitOpenglInfo } WineGLInfo.glVersion = (const char *) pglGetString(GL_VERSION); - WineGLInfo.glExtensions = (const char *) pglGetString(GL_EXTENSIONS); + WineGLInfo.glExtensions = strdup((const char *) pglGetString(GL_EXTENSIONS)); /* Get the common GLX version supported by GLX client and server ( major/minor) */ pglXQueryVersion(gdi_display, &WineGLInfo.glxVersion[0], &WineGLInfo.glxVersion[1]);

1 0

Matt Finnicum : riched20: Remove excessive traces from reader.c.
by Alexandre Julliard 25 Jan '07

25 Jan '07

Module: wine Branch: master Commit: 306013d4e5012776ce84934ae13105f3bcef1324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=306013d4e5012776ce84934ae… Author: Matt Finnicum <mattfinn(a)gmail.com> Date: Wed Jan 24 23:20:54 2007 -0600 riched20: Remove excessive traces from reader.c. --- dlls/riched20/reader.c | 40 ---------------------------------------- 1 files changed, 0 insertions(+), 40 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 99431e8..7fb641b 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -111,8 +111,6 @@ int _RTFGetChar(RTF_Info *info) int ch; ME_InStream *stream = info->stream; - TRACE("\n"); - if (stream->dwSize <= stream->dwUsed) { ME_StreamInFill(stream); @@ -131,8 +129,6 @@ int _RTFGetChar(RTF_Info *info) void RTFSetEditStream(RTF_Info *info, ME_InStream *stream) { - TRACE("\n"); - info->stream = stream; } @@ -198,8 +194,6 @@ void RTFInit(RTF_Info *info) { int i; - TRACE("\n"); - if (info->rtfTextBuf == NULL) /* initialize the text buffers */ { info->rtfTextBuf = RTFAlloc (rtfBufSiz); @@ -262,8 +256,6 @@ void RTFInit(RTF_Info *info) void RTFSetInputName(RTF_Info *info, char *name) { - TRACE("\n"); - info->inputName = RTFStrSave (name); if (info->inputName == NULL) ERR ("RTFSetInputName: out of memory\n"); @@ -278,8 +270,6 @@ char *RTFGetInputName(RTF_Info *info) void RTFSetOutputName(RTF_Info *info, char *name) { - TRACE("\n"); - info->outputName = RTFStrSave (name); if (info->outputName == NULL) ERR ("RTFSetOutputName: out of memory\n"); @@ -367,8 +357,6 @@ void RTFRouteToken(RTF_Info *info) { RTFFuncPtr p; - TRACE("\n"); - if (info->rtfClass < 0 || info->rtfClass >= rtfMaxClass) /* watchdog */ { ERR( "Unknown class %d: %s (reader malfunction)\n", @@ -402,8 +390,6 @@ void RTFSkipGroup(RTF_Info *info) { int level = 1; - TRACE("\n"); - while (RTFGetToken (info) != rtfEOF) { if (info->rtfClass == rtfGroup) @@ -430,7 +416,6 @@ int RTFGetToken(RTF_Info *info) { RTFFuncPtr p; - TRACE("\n"); /* don't try to return anything once EOF is reached */ if (info->rtfClass == rtfEOF) { return rtfEOF; @@ -470,8 +455,6 @@ RTFFuncPtr RTFGetReadHook(RTF_Info *info void RTFUngetToken(RTF_Info *info) { - TRACE("\n"); - if (info->pushedClass >= 0) /* there's already an ungotten token */ ERR ("cannot unget two tokens\n"); if (info->rtfClass < 0) @@ -494,8 +477,6 @@ int RTFPeekToken(RTF_Info *info) static void _RTFGetToken(RTF_Info *info) { - TRACE("\n"); - if (info->rtfFormat == SF_TEXT) { info->rtfMajor = GetChar (info); @@ -599,8 +580,6 @@ static void _RTFGetToken2(RTF_Info *info int sign; int c; - TRACE("\n"); - /* initialize token vars */ info->rtfClass = rtfUnknown; @@ -770,8 +749,6 @@ static int GetChar(RTF_Info *info) int c; int oldBumpLine; - TRACE("\n"); - if ((c = _RTFGetChar(info)) != EOF) { info->rtfTextBuf[info->rtfTextLen++] = c; @@ -811,8 +788,6 @@ static int GetChar(RTF_Info *info) void RTFSetToken(RTF_Info *info, int class, int major, int minor, int param, const char *text) { - TRACE("\n"); - info->rtfClass = class; info->rtfMajor = major; info->rtfMinor = minor; @@ -860,8 +835,6 @@ static void ReadFontTbl(RTF_Info *info) int old = -1; const char *fn = "ReadFontTbl"; - TRACE("\n"); - for (;;) { RTFGetToken (info); @@ -1041,8 +1014,6 @@ static void ReadColorTbl(RTF_Info *info) const char *fn = "ReadColorTbl"; int group_level = 1; - TRACE("\n"); - for (;;) { RTFGetToken (info); @@ -1100,8 +1071,6 @@ static void ReadStyleSheet(RTF_Info *inf const char *fn = "ReadStyleSheet"; int real_style; - TRACE("\n"); - for (;;) { RTFGetToken (info); @@ -1346,8 +1315,6 @@ void RTFExpandStyle(RTF_Info *info, int RTFStyle *s; RTFStyleElt *se; - TRACE("\n"); - if (n == -1) return; s = RTFGetStyle (info, n); @@ -2365,7 +2332,6 @@ static void Lookup(RTF_Info *info, char RTFHashTableEntry *entry; int i; - TRACE("\n"); ++s; /* skip over the leading \ character */ hash = Hash (s); entry = &rtfHashTable[hash % (RTF_KEY_COUNT * 2)]; @@ -2498,8 +2464,6 @@ TextClass (RTF_Info *info) static void ControlClass (RTF_Info *info) { - TRACE("\n"); - switch (info->rtfMajor) { case rtfCharAttr: @@ -2581,7 +2545,6 @@ CharSet(RTF_Info *info) static void Destination (RTF_Info *info) { - TRACE("\n"); if (!RTFGetDestinationCallback(info, info->rtfMinor)) RTFSkipGroup (info); } @@ -2614,9 +2577,6 @@ DocAttr(RTF_Info *info) static void SpecialChar (RTF_Info *info) { - - TRACE("\n"); - switch (info->rtfMinor) { case rtfOptDest:

1 0

Matt Finnicum : riched20: Create undos in StreamIn at the right times. Adds tests for when StreamIn should be undoable.
by Alexandre Julliard 25 Jan '07

25 Jan '07

Module: wine Branch: master Commit: 7eabbec632470156ca4141e24f7085e43f32a210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eabbec632470156ca4141e24… Author: Matt Finnicum <mattfinn(a)gmail.com> Date: Thu Jan 25 00:11:07 2007 -0600 riched20: Create undos in StreamIn at the right times. Adds tests for when StreamIn should be undoable. --- dlls/riched20/editor.c | 30 ++++++++----- dlls/riched20/tests/editor.c | 101 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+), 11 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 9b1904d..783e91d 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -597,7 +597,7 @@ static LRESULT ME_StreamIn(ME_TextEditor { RTF_Info parser; ME_Style *style; - int from, to, to2; + int from, to, to2, nUndoMode; int nEventMask = editor->nEventMask; ME_InStream inStream; @@ -619,7 +619,15 @@ static LRESULT ME_StreamIn(ME_TextEditor ME_ClearTempStyle(editor); /* FIXME restore default paragraph formatting ! */ } - + + + /* Back up undo mode to a local variable */ + nUndoMode = editor->nUndoMode; + + /* Only create an undo if SFF_SELECTION is set */ + if (!(format & SFF_SELECTION)) + editor->nUndoMode = umIgnore; + inStream.editstream = stream; inStream.editstream->dwError = 0; inStream.dwSize = 0; @@ -671,17 +679,17 @@ static LRESULT ME_StreamIn(ME_TextEditor SendMessageA(editor->hWnd, EM_SETSEL, 0, 0); } - if (format & SFF_SELECTION) - { - /* even if we didn't add an undo, we need to commit the ones added earlier */ - ME_CommitUndo(editor); - } - else - { + /* Restore saved undo mode */ + editor->nUndoMode = nUndoMode; + + /* even if we didn't add an undo, we need to commit anything on the stack */ + ME_CommitUndo(editor); + + /* If SFF_SELECTION isn't set, delete any undos from before we started too */ + if (!(format & SFF_SELECTION)) ME_EmptyUndoStack(editor); - } - ME_ReleaseStyle(style); + ME_ReleaseStyle(style); editor->nEventMask = nEventMask; if (editor->bRedraw) { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index f86ca5a..60ab7ab 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1462,6 +1462,106 @@ static void test_WM_PASTE(void) DestroyWindow(hwndRichEdit); } +static int nCallbackCount = 0; + +static DWORD CALLBACK EditStreamCallback(DWORD_PTR dwCookie, LPBYTE pbBuff, + LONG cb, LONG* pcb) +{ + const char text[] = {'t','e','s','t'}; + + if (sizeof(text) <= cb) + { + if ((int)dwCookie != nCallbackCount) + { + *pcb = 0; + return 0; + } + + memcpy (pbBuff, text, sizeof(text)); + *pcb = sizeof(text); + + nCallbackCount++; + + return 0; + } + else + return 1; /* indicates callback failed */ +} + +static void test_EM_StreamIn_Undo(void) +{ + /* The purpose of this test is to determine when a EM_StreamIn should be + * undoable. This is important because WM_PASTE currently uses StreamIn and + * pasting should always be undoable but streaming isn't always. + * + * cases to test: + * StreamIn plain text without SFF_SELECTION. + * StreamIn plain text with SFF_SELECTION set but a zero-length selection + * StreamIn plain text with SFF_SELECTION and a valid, normal selection + * StreamIn plain text with SFF_SELECTION and a backwards-selection (from>to) + * Feel free to add tests for other text modes or StreamIn things. + */ + + + HWND hwndRichEdit = new_richedit(NULL); + LRESULT result; + EDITSTREAM es; + char buffer[1024] = {0}; + const char randomtext[] = "Some text"; + + es.pfnCallback = (EDITSTREAMCALLBACK) EditStreamCallback; + + /* StreamIn, no SFF_SELECTION */ + es.dwCookie = nCallbackCount; + SendMessage(hwndRichEdit,EM_EMPTYUNDOBUFFER, 0,0); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) randomtext); + SendMessage(hwndRichEdit, EM_SETSEL,0,0); + SendMessage(hwndRichEdit, EM_STREAMIN, (WPARAM)SF_TEXT, (LPARAM)&es); + SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + result = strcmp (buffer,"test"); + ok (result == 0, + "EM_STREAMIN: Test 1 set wrong text: Result: %s\n",buffer); + + result = SendMessage(hwndRichEdit, EM_CANUNDO, 0, 0); + ok (result == FALSE, + "EM_STREAMIN without SFF_SELECTION wrongly allows undo\n"); + + /* StreamIn, SFF_SELECTION, but nothing selected */ + es.dwCookie = nCallbackCount; + SendMessage(hwndRichEdit,EM_EMPTYUNDOBUFFER, 0,0); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) randomtext); + SendMessage(hwndRichEdit, EM_SETSEL,0,0); + SendMessage(hwndRichEdit, EM_STREAMIN, + (WPARAM)(SF_TEXT|SFF_SELECTION), (LPARAM)&es); + SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + result = strcmp (buffer,"testSome text"); + ok (result == 0, + "EM_STREAMIN: Test 2 set wrong text: Result: %s\n",buffer); + + result = SendMessage(hwndRichEdit, EM_CANUNDO, 0, 0); + ok (result == TRUE, + "EM_STREAMIN with SFF_SELECTION but no selection set " + "should create an undo\n"); + + /* StreamIn, SFF_SELECTION, with a selection */ + es.dwCookie = nCallbackCount; + SendMessage(hwndRichEdit,EM_EMPTYUNDOBUFFER, 0,0); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) randomtext); + SendMessage(hwndRichEdit, EM_SETSEL,4,5); + SendMessage(hwndRichEdit, EM_STREAMIN, + (WPARAM)(SF_TEXT|SFF_SELECTION), (LPARAM)&es); + SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + result = strcmp (buffer,"Sometesttext"); + ok (result == 0, + "EM_STREAMIN: Test 2 set wrong text: Result: %s\n",buffer); + + result = SendMessage(hwndRichEdit, EM_CANUNDO, 0, 0); + ok (result == TRUE, + "EM_STREAMIN with SFF_SELECTION and selection set " + "should create an undo\n"); + +} + START_TEST( editor ) { MSG msg; @@ -1490,6 +1590,7 @@ START_TEST( editor ) test_EM_GETMODIFY(); test_EM_EXSETSEL(); test_WM_PASTE(); + test_EM_StreamIn_Undo(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Jan Zerebecki : opengl32: Remove redundant const.
by Alexandre Julliard 25 Jan '07

25 Jan '07

Module: wine Branch: master Commit: cfaf5059b2d08c76b45981099f259389cebb9181 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfaf5059b2d08c76b45981099… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Wed Jan 24 19:31:56 2007 +0100 opengl32: Remove redundant const. --- dlls/opengl32/wgl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 32e7c12..b2c3cc5 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -195,7 +195,7 @@ static BOOL is_extension_supported(const if(strncmp(extension, "GL_VERSION_", 11) == 0) { const GLubyte *gl_version = glGetString(GL_VERSION); - const const char *version = extension + 11; /* Move past 'GL_VERSION_' */ + const char *version = extension + 11; /* Move past 'GL_VERSION_' */ if(!gl_version) { ERR("Error no OpenGL version found,\n");

1 0

Felix Nawothnig : comctl32: Degrade ERR to WARN.
by Alexandre Julliard 25 Jan '07

25 Jan '07

Module: wine Branch: master Commit: 306718152c8a165c4033d24cfe88313bf5da2fef URL: http://source.winehq.org/git/wine.git/?a=commit;h=306718152c8a165c4033d24cf… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Wed Jan 24 19:15:14 2007 +0100 comctl32: Degrade ERR to WARN. --- dlls/comctl32/imagelist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index f14149b..54248bc 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1696,7 +1696,7 @@ ImageList_LoadImageW (HINSTANCE hi, LPCW handle = LoadImageW (hi, lpbmp, uType, 0, 0, uFlags); if (!handle) { - ERR("Error loading image!\n"); + WARN("Couldn't load image\n"); return NULL; }

1 0

Francois Gouget : sfc_os: Update win32.api to fix the winapi_check warnings .
by Alexandre Julliard 25 Jan '07

25 Jan '07

Module: wine Branch: master Commit: d96cfd0734952ed5c284a7c4a3d9ce0c6319d996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d96cfd0734952ed5c284a7c4a… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 24 15:42:35 2007 +0100 sfc_os: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index e0f509b..65a8aff 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -3829,7 +3829,7 @@ LPWSTR PCWSTR PWSTR -%%sfc.dll +%%sfc_os.dll %long

1 0

Huw Davies : oleaut32: The typelib version numbers should be written to the registry in hex.
by Alexandre Julliard 25 Jan '07

25 Jan '07

Module: wine Branch: master Commit: a59e4899f54b1eb983d7a5d73a2d455eaec2805d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a59e4899f54b1eb983d7a5d73… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 24 12:02:29 2007 +0000 oleaut32: The typelib version numbers should be written to the registry in hex. --- dlls/oleaut32/typelib.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 0992683..9525ee8 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -165,9 +165,9 @@ static BOOL find_typelib_key( REFGUID gu { INT v_maj, v_min; - if (sscanf(key_name, "%u.%u", &v_maj, &v_min) == 2) + if (sscanf(key_name, "%x.%x", &v_maj, &v_min) == 2) { - TRACE("found %s: %u.%u\n", debugstr_w(buffer), v_maj, v_min); + TRACE("found %s: %x.%x\n", debugstr_w(buffer), v_maj, v_min); if (*wMaj == v_maj) { @@ -195,7 +195,7 @@ static BOOL find_typelib_key( REFGUID gu static WCHAR *get_typelib_key( REFGUID guid, WORD wMaj, WORD wMin, WCHAR *buffer ) { static const WCHAR TypelibW[] = {'T','y','p','e','l','i','b','\\',0}; - static const WCHAR VersionFormatW[] = {'\\','%','u','.','%','u',0}; + static const WCHAR VersionFormatW[] = {'\\','%','x','.','%','x',0}; memcpy( buffer, TypelibW, sizeof(TypelibW) ); StringFromGUID2( guid, buffer + strlenW(buffer), 40 ); @@ -668,7 +668,7 @@ HRESULT WINAPI RegisterTypeLib( KEY_WRITE, NULL, &subKey, NULL) == ERROR_SUCCESS) { WCHAR buffer[40]; - static const WCHAR fmtver[] = {'%','u','.','%','u',0 }; + static const WCHAR fmtver[] = {'%','x','.','%','x',0 }; static const WCHAR VersionW[] = {'V','e','r','s','i','o','n',0}; StringFromGUID2(&attr->guid, buffer, 40);

1 0