May 2009 - Wine-commits - list.winehq.org

Tony Wasserka : d3dx9: Add stubs for the D3DXGetImageInfo function group.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: bf353f180d622cbf8508af7dbc9590e33293a6ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf353f180d622cbf8508af7db… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Sat May 23 12:56:19 2009 +0200 d3dx9: Add stubs for the D3DXGetImageInfo function group. --- dlls/d3dx9_36/Makefile.in | 3 +- dlls/d3dx9_36/d3dx9_36.spec | 10 +++--- dlls/d3dx9_36/surface.c | 69 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index 7cd5c3c..16fd41c 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -12,7 +12,8 @@ C_SRCS = \ math.c \ mesh.c \ shader.c \ - sprite.c + sprite.c \ + surface.c RC_SRCS = version.rc diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 8a5082d..1c8eecb 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -151,11 +151,11 @@ @ stub D3DXGetDeclVertexSize @ stdcall D3DXGetDriverLevel(ptr) @ stdcall D3DXGetFVFVertexSize(long) -@ stdcall D3DXGetImageInfoFromFileA(ptr ptr) d3dx8.D3DXGetImageInfoFromFileA -@ stdcall D3DXGetImageInfoFromFileInMemory(ptr long ptr) d3dx8.D3DXGetImageInfoFromFileInMemory -@ stdcall D3DXGetImageInfoFromFileW(ptr ptr) d3dx8.D3DXGetImageInfoFromFileW -@ stdcall D3DXGetImageInfoFromResourceA(long ptr ptr) d3dx8.D3DXGetImageInfoFromResourceA -@ stdcall D3DXGetImageInfoFromResourceW(long ptr ptr) d3dx8.D3DXGetImageInfoFromResourceW +@ stdcall D3DXGetImageInfoFromFileA(str ptr) +@ stdcall D3DXGetImageInfoFromFileInMemory(ptr long ptr) +@ stdcall D3DXGetImageInfoFromFileW(wstr ptr) +@ stdcall D3DXGetImageInfoFromResourceA(long str ptr) +@ stdcall D3DXGetImageInfoFromResourceW(long wstr ptr) @ stdcall D3DXGetPixelShaderProfile(ptr) @ stub D3DXGetShaderConstantTable @ stub D3DXGetShaderConstantTableEx diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c new file mode 100644 index 0000000..968e3ef --- /dev/null +++ b/dlls/d3dx9_36/surface.c @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2009 Tony Wasserka + * + * 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 + * + */ + +#include "wine/debug.h" +#include "d3dx9_36_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + + +/************************************************************ + * D3DXGetImageInfoFromFileInMemory + * + * Fills a D3DXIMAGE_INFO structure with info about an image + * + * PARAMS + * data [I] pointer to the image file data + * datasize [I] size of the passed data + * info [O] pointer to the destination structure + * + * RETURNS + * Success: D3D_OK + * Failure: D3DERR_INVALIDCALL + * + */ +HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3DXIMAGE_INFO *info) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI D3DXGetImageInfoFromFileA(LPCSTR file, D3DXIMAGE_INFO *info) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI D3DXGetImageInfoFromFileW(LPCWSTR file, D3DXIMAGE_INFO *info) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI D3DXGetImageInfoFromResourceA(HMODULE module, LPCSTR resource, D3DXIMAGE_INFO *info) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI D3DXGetImageInfoFromResourceW(HMODULE module, LPCWSTR resource, D3DXIMAGE_INFO *info) +{ + FIXME("stub\n"); + return E_NOTIMPL; +}

1 0

Paul Vriens : mshtml/tests: Fix some test failures on IE8.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: c7f01479c308c4fc817b9ff8b2055969b0e6bfdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7f01479c308c4fc817b9ff8b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon May 25 14:23:17 2009 +0200 mshtml/tests: Fix some test failures on IE8. --- dlls/mshtml/tests/dom.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 249968d..aaf1a39 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2927,7 +2927,9 @@ static void test_default_style(IHTMLStyle *style) hres = IHTMLStyle_get_posWidth(style, &f); ok(hres == S_OK, "get_posWidth failed: %08x\n", hres); - ok(f == 2.0f, "f = %f\n", f); + ok(f == 2.0f || + f == 2.2f, /* IE8 */ + "f = %f\n", f); V_VT(&v) = VT_BSTR; V_BSTR(&v) = a2bstr("auto"); @@ -2992,14 +2994,18 @@ static void test_default_style(IHTMLStyle *style) hres = IHTMLStyle_get_posLeft(style, &f); ok(hres == S_OK, "get_posLeft failed: %08x\n", hres); - ok(f == 4.0, "expected 4.0 got %f\n", f); + ok(f == 4.0 || + f == 4.9f, /* IE8 */ + "expected 4.0 or 4.9 (IE8) got %f\n", f); /* Ensure left is updated correctly. */ V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_left(style, &v); ok(hres == S_OK, "get_left failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); - ok(!strcmp_wa(V_BSTR(&v), "4px"), "V_BSTR(v) = %s\n", dbgstr_w(V_BSTR(&v))); + ok(!strcmp_wa(V_BSTR(&v), "4px") || + !strcmp_wa(V_BSTR(&v), "4.9px"), /* IE8 */ + "V_BSTR(v) = %s\n", dbgstr_w(V_BSTR(&v))); VariantClear(&v); /* Test left */ @@ -3052,7 +3058,9 @@ static void test_default_style(IHTMLStyle *style) hres = IHTMLStyle_get_posTop(style, &f); ok(hres == S_OK, "get_posTop failed: %08x\n", hres); - ok(f == 4.0, "expected 4.0 got %f\n", f); + ok(f == 4.0 || + f == 4.9f, /* IE8 */ + "expected 4.0 or 4.9 (IE8) got %f\n", f); V_VT(&v) = VT_BSTR; V_BSTR(&v) = a2bstr("3px"); @@ -3103,7 +3111,9 @@ static void test_default_style(IHTMLStyle *style) hres = IHTMLStyle_get_posHeight(style, &f); ok(hres == S_OK, "get_posHeight failed: %08x\n", hres); - ok(f == 4.0, "expected 4.0 got %f\n", f); + ok(f == 4.0 || + f == 4.9f, /* IE8 */ + "expected 4.0 or 4.9 (IE8) got %f\n", f); V_VT(&v) = VT_BSTR; V_BSTR(&v) = a2bstr("64px");

1 0

Alexandre Julliard : kernel32: Remove the file parameter check again in LoadLibraryExW since some broken apps pass garbage here .
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 2cd36b6b60e7726bb881f18b0f333ece699c8313 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cd36b6b60e7726bb881f18b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 26 14:26:42 2009 +0200 kernel32: Remove the file parameter check again in LoadLibraryExW since some broken apps pass garbage here. --- dlls/kernel32/module.c | 6 ------ dlls/kernel32/tests/module.c | 28 ++++++++++++++++++++++++---- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 1b259e5..86675b6 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -922,12 +922,6 @@ HMODULE WINAPI LoadLibraryExW(LPCWSTR libnameW, HANDLE hfile, DWORD flags) UNICODE_STRING wstr; HMODULE res; - if (hfile) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - if (!libnameW) { SetLastError(ERROR_INVALID_PARAMETER); diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 73d7946..374a18e 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -249,10 +249,24 @@ static void testLoadLibraryEx(void) SetLastError(0xdeadbeef); hmodule = LoadLibraryExA("testfile.dll", hfile, 0); ok(hmodule == 0, "Expected 0, got %p\n", hmodule); - ok(GetLastError() == ERROR_SHARING_VIOLATION || - GetLastError() == ERROR_INVALID_PARAMETER || /* win2k3 */ - GetLastError() == ERROR_FILE_NOT_FOUND, /* win9x */ - "Unexpected last error, got %d\n", GetLastError()); + todo_wine + { + ok(GetLastError() == ERROR_SHARING_VIOLATION || + GetLastError() == ERROR_INVALID_PARAMETER || /* win2k3 */ + GetLastError() == ERROR_FILE_NOT_FOUND, /* win9x */ + "Unexpected last error, got %d\n", GetLastError()); + } + + SetLastError(0xdeadbeef); + hmodule = LoadLibraryExA("testfile.dll", (HANDLE)0xdeadbeef, 0); + ok(hmodule == 0, "Expected 0, got %p\n", hmodule); + todo_wine + { + ok(GetLastError() == ERROR_SHARING_VIOLATION || + GetLastError() == ERROR_INVALID_PARAMETER || /* win2k3 */ + GetLastError() == ERROR_FILE_NOT_FOUND, /* win9x */ + "Unexpected last error, got %d\n", GetLastError()); + } /* try to open a file that is locked */ SetLastError(0xdeadbeef); @@ -304,6 +318,12 @@ static void testLoadLibraryEx(void) GetLastError() == ERROR_SUCCESS, /* win9x */ "Expected 0xdeadbeef or ERROR_SUCCESS, got %d\n", GetLastError()); + /* try invalid file handle */ + SetLastError(0xdeadbeef); + hmodule = LoadLibraryExA(path, (HANDLE)0xdeadbeef, 0); + if (!hmodule) /* succeeds on xp and older */ + ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError()); + CloseHandle(hmodule); /* load kernel32.dll with no path */

1 0

André Hentschel : comdlg32: Improve the German Find and FindReplace dialogs.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: b7fbe1d527db90291ff166a8cc5e986be1fabdc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7fbe1d527db90291ff166a8c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 25 15:02:13 2009 +0200 comdlg32: Improve the German Find and FindReplace dialogs. --- dlls/comdlg32/cdlg_De.rc | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/comdlg32/cdlg_De.rc b/dlls/comdlg32/cdlg_De.rc index 46c4291..8e6432e 100644 --- a/dlls/comdlg32/cdlg_De.rc +++ b/dlls/comdlg32/cdlg_De.rc @@ -212,40 +212,40 @@ FONT 8, "MS Shell Dlg" } -FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62 +FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 30, 73, 241, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Suchen" FONT 8, "MS Shell Dlg" { - LTEXT "S&uchen nach:", -1, 4, 8, 42, 8 - EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Nur ganze &Worte", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Beachte Gro�/Kleinschreibung", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Richtung", 1072, 107, 26, 68, 28 - CONTROL "H&och", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 - CONTROL "&Runter", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 - DEFPUSHBUTTON "&N�chsten finden", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Abbrechen", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Hilfe", pshHelp, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP + LTEXT "S&uchen nach:", -1, 4, 8, 45, 8 + EDITTEXT 1152, 53, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + CHECKBOX "Nu&r ganzes Wort suchen", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Gro�-/Klein&schreibung", 1041, 4, 42, 84, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Suchrichtung", 1072, 113, 23, 68, 37 + CONTROL "Nach &oben", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 117, 34, 50, 10 + CONTROL "Nach &unten", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 117, 47, 50, 10 + DEFPUSHBUTTON "&Weitersuchen", IDOK, 187, 5, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Abbrechen", IDCANCEL, 187, 23, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Hilfe", pshHelp, 187, 45, 50, 14, WS_GROUP | WS_TABSTOP } -REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94 +REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 44, 240, 94 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ersetzen" FONT 8, "MS Shell Dlg" { - LTEXT "S&uchen nach:", -1, 4, 9, 48, 8 - EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "Ersetzen &durch:", -1, 4, 26, 48, 8 - EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Nur ganze &Worte", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Beachte Gro�/Kleinschreibung", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP - DEFPUSHBUTTON "&N�chsten finden", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Ersetzen", psh1, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Alle ersetzen", psh2, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Abbrechen", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Hilfe", pshHelp, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP + LTEXT "&Suchen nach:", -1, 4, 9, 48, 8 + EDITTEXT 1152, 56, 7, 112, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "Ersetzen &durch:", -1, 4, 26, 52, 8 + EDITTEXT 1153, 56, 24, 112, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + CHECKBOX "Nu&r ganzes Wort", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Gro�-/Kleins&chreibung", 1041, 5, 62, 86, 12, BS_AUTOCHECKBOX | WS_TABSTOP + DEFPUSHBUTTON "&Weitersuchen", IDOK, 175, 6, 60, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Ersetzen", psh1, 175, 23, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "A&lles ersetzen", psh2, 175, 40, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Abbrechen", IDCANCEL, 175, 57, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Hilfe", pshHelp, 175, 74, 60, 14, WS_GROUP | WS_TABSTOP } NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164

1 0

Hib Eris : msi/tests: Add tests for binary OBJECTS.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 8356484c9fea38defb52b61f5bac1b4c5852eb2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8356484c9fea38defb52b61f5… Author: Hib Eris <hib(a)hiberis.nl> Date: Sun May 24 18:51:41 2009 +0200 msi/tests: Add tests for binary OBJECTS. --- dlls/msi/tests/db.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 41f65f1..249b990 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1482,6 +1482,89 @@ static void test_streamtable(void) DeleteFile(msifile); } +static void test_binary(void) +{ + MSIHANDLE hdb = 0, rec; + char file[MAX_PATH]; + char buf[MAX_PATH]; + DWORD size; + LPCSTR query; + UINT r; + + /* insert a file into the Binary table */ + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb ); + ok( r == ERROR_SUCCESS , "Failed to open database\n" ); + + query = "CREATE TABLE `Binary` ( `Name` CHAR(72) NOT NULL, `ID` INT NOT NULL, `Data` OBJECT PRIMARY KEY `Name`, `ID`)"; + r = run_query( hdb, 0, query ); + ok( r == ERROR_SUCCESS, "Cannot create Binary table: %d\n", r ); + + create_file( "test.txt" ); + rec = MsiCreateRecord( 1 ); + r = MsiRecordSetStream( rec, 1, "test.txt" ); + ok( r == ERROR_SUCCESS, "Failed to add stream data to the record: %d\n", r); + DeleteFile( "test.txt" ); + + query = "INSERT INTO `Binary` ( `Name`, `ID`, `Data` ) VALUES ( 'filename1', 1, ? )"; + r = run_query( hdb, rec, query ); + ok( r == ERROR_SUCCESS, "Insert into Binary table failed: %d\n", r ); + + r = MsiCloseHandle( rec ); + ok( r == ERROR_SUCCESS , "Failed to close record handle\n" ); + + r = MsiDatabaseCommit( hdb ); + ok( r == ERROR_SUCCESS , "Failed to commit database\n" ); + + r = MsiCloseHandle( hdb ); + ok( r == ERROR_SUCCESS , "Failed to close database\n" ); + + /* read file from the Stream table */ + r = MsiOpenDatabase( msifile, MSIDBOPEN_READONLY, &hdb ); + ok( r == ERROR_SUCCESS , "Failed to open database\n" ); + + query = "SELECT * FROM `_Streams`"; + r = do_query( hdb, query, &rec ); + todo_wine ok( r == ERROR_SUCCESS, "SELECT query failed: %d\n", r ); + + size = MAX_PATH; + r = MsiRecordGetString( rec, 1, file, &size ); + todo_wine ok( r == ERROR_SUCCESS, "Failed to get string: %d\n", r ); + todo_wine ok( !lstrcmp(file, "Binary.filename1.1"), "Expected 'Binary.filename1.1', got %s\n", file ); + + size = MAX_PATH; + memset( buf, 0, MAX_PATH ); + r = MsiRecordReadStream( rec, 2, buf, &size ); + todo_wine ok( r == ERROR_SUCCESS, "Failed to get stream: %d\n", r ); + todo_wine ok( !lstrcmp(buf, "test.txt\n"), "Expected 'test.txt\\n', got %s\n", buf ); + + r = MsiCloseHandle( rec ); + ok( r == ERROR_SUCCESS , "Failed to close record handle\n" ); + + /* read file from the Binary table */ + query = "SELECT * FROM `Binary`"; + r = do_query( hdb, query, &rec ); + ok( r == ERROR_SUCCESS, "SELECT query failed: %d\n", r ); + + size = MAX_PATH; + r = MsiRecordGetString( rec, 1, file, &size ); + ok( r == ERROR_SUCCESS, "Failed to get string: %d\n", r ); + ok( !lstrcmp(file, "filename1"), "Expected 'filename1', got %s\n", file ); + + size = MAX_PATH; + memset( buf, 0, MAX_PATH ); + r = MsiRecordReadStream( rec, 3, buf, &size ); + todo_wine ok( r == ERROR_SUCCESS, "Failed to get stream: %d\n", r ); + todo_wine ok( !lstrcmp(buf, "test.txt\n"), "Expected 'test.txt\\n', got %s\n", buf ); + + r = MsiCloseHandle( rec ); + ok( r == ERROR_SUCCESS , "Failed to close record handle\n" ); + + r = MsiCloseHandle( hdb ); + ok( r == ERROR_SUCCESS , "Failed to close database\n" ); + + DeleteFile( msifile ); +} + static void test_where(void) { MSIHANDLE hdb = 0, rec, view; @@ -7528,6 +7611,7 @@ START_TEST(db) test_msiexport(); test_longstrings(); test_streamtable(); + test_binary(); test_where(); test_msiimport(); test_markers();

1 0

Hib Eris : msi: Add support for binary OBJECTS.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: f6dd90de5ec08218cc324a847d81021b0128d2a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6dd90de5ec08218cc324a847… Author: Hib Eris <hib(a)hiberis.nl> Date: Sun May 24 18:51:53 2009 +0200 msi: Add support for binary OBJECTS. --- dlls/msi/record.c | 1 + dlls/msi/table.c | 199 +++++++++++++++++++++++++++++++++++++++------------ dlls/msi/tests/db.c | 23 +++---- 3 files changed, 165 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6dd90de5ec08218cc324…

1 0

Hib Eris : msi: Support transforms with binary OBJECTS.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: d9568722aa1c60ae402f18f7a079cb0988dd8c58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9568722aa1c60ae402f18f7a… Author: Hib Eris <hib(a)hiberis.nl> Date: Sun May 24 18:51:58 2009 +0200 msi: Support transforms with binary OBJECTS. --- dlls/msi/msipriv.h | 1 + dlls/msi/record.c | 2 +- dlls/msi/table.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 85 insertions(+), 4 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index ccfd6e3..408c968 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -701,6 +701,7 @@ extern UINT MSI_RecordGetStringW( MSIRECORD * , UINT, LPWSTR, LPDWORD); extern UINT MSI_RecordGetStringA( MSIRECORD *, UINT, LPSTR, LPDWORD); extern int MSI_RecordGetInteger( MSIRECORD *, UINT ); extern UINT MSI_RecordReadStream( MSIRECORD *, UINT, char *, LPDWORD); +extern UINT MSI_RecordSetStream(MSIRECORD *, UINT, IStream *); extern UINT MSI_RecordGetFieldCount( const MSIRECORD *rec ); extern UINT MSI_RecordStreamToFile( MSIRECORD *, UINT, LPCWSTR ); extern UINT MSI_RecordCopyField( MSIRECORD *, UINT, MSIRECORD *, UINT ); diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 283c418..9211e1c 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -661,7 +661,7 @@ static UINT RECORD_StreamFromFile(LPCWSTR szFile, IStream **pstm) return ERROR_SUCCESS; } -static UINT MSI_RecordSetStream(MSIRECORD *rec, UINT iField, IStream *stream) +UINT MSI_RecordSetStream(MSIRECORD *rec, UINT iField, IStream *stream) { if ( (iField == 0) || (iField > rec->count) ) return ERROR_INVALID_PARAMETER; diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 8bb607c..885c0dd 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2373,7 +2373,67 @@ static UINT read_raw_int(const BYTE *data, UINT col, UINT bytes) return ret; } +static UINT msi_record_encoded_stream_name( const MSITABLEVIEW *tv, MSIRECORD *rec, LPWSTR *pstname ) +{ + static const WCHAR szDot[] = { '.', 0 }; + LPWSTR stname = NULL, sval, p; + DWORD len; + UINT i, r; + + TRACE("%p %p\n", tv, rec); + + len = lstrlenW( tv->name ) + 1; + stname = msi_alloc( len*sizeof(WCHAR) ); + if ( !stname ) + { + r = ERROR_OUTOFMEMORY; + goto err; + } + + lstrcpyW( stname, tv->name ); + + for ( i = 0; i < tv->num_cols; i++ ) + { + if ( tv->columns[i].type & MSITYPE_KEY ) + { + sval = msi_dup_record_field( rec, i + 1 ); + if ( !sval ) + { + r = ERROR_OUTOFMEMORY; + goto err; + } + + len += lstrlenW( szDot ) + lstrlenW ( sval ); + p = msi_realloc ( stname, len*sizeof(WCHAR) ); + if ( !p ) + { + r = ERROR_OUTOFMEMORY; + goto err; + } + stname = p; + + lstrcatW( stname, szDot ); + lstrcatW( stname, sval ); + + msi_free( sval ); + } + else + continue; + } + + *pstname = encode_streamname( FALSE, stname ); + msi_free( stname ); + + return ERROR_SUCCESS; + +err: + msi_free ( stname ); + *pstname = NULL; + return r; +} + static MSIRECORD *msi_get_transform_record( const MSITABLEVIEW *tv, const string_table *st, + IStorage *stg, const BYTE *rawdata, UINT bytes_per_strref ) { UINT i, val, ofs = 0; @@ -2397,8 +2457,28 @@ static MSIRECORD *msi_get_transform_record( const MSITABLEVIEW *tv, const string if ( (~mask&1) && (~columns[i].type & MSITYPE_KEY) && ((1<<i) & ~mask) ) continue; - if( (columns[i].type & MSITYPE_STRING) && - ! MSITYPE_IS_BINARY(tv->columns[i].type) ) + if( MSITYPE_IS_BINARY(tv->columns[i].type) ) + { + LPWSTR encname; + IStream *stm = NULL; + UINT r; + + ofs += bytes_per_column( tv->db, &columns[i] ); + + r = msi_record_encoded_stream_name( tv, rec, &encname ); + if ( r != ERROR_SUCCESS ) + return NULL; + + r = IStorage_OpenStream( stg, encname, NULL, + STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm ); + msi_free( encname ); + if ( r != ERROR_SUCCESS ) + return NULL; + + MSI_RecordSetStream( rec, i+1, stm ); + TRACE(" field %d [%s]\n", i+1, debugstr_w(encname)); + } + else if( columns[i].type & MSITYPE_STRING ) { LPCWSTR sval; @@ -2659,7 +2739,7 @@ static UINT msi_table_load_transform( MSIDATABASE *db, IStorage *stg, break; } - rec = msi_get_transform_record( tv, st, &rawdata[n], bytes_per_strref ); + rec = msi_get_transform_record( tv, st, stg, &rawdata[n], bytes_per_strref ); if (rec) { if ( mask & 1 )

1 0

Hib Eris : msi/tests: Add test for importing binary OBJECTS.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: e7ebbbe62e0f92339c530a86f4d05aab8d921fa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7ebbbe62e0f92339c530a86f… Author: Hib Eris <hib(a)hiberis.nl> Date: Sun May 24 18:52:04 2009 +0200 msi/tests: Add test for importing binary OBJECTS. --- dlls/msi/tests/db.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index a9bd475..d408c49 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1939,6 +1939,63 @@ static void test_msiimport(void) DeleteFileA(msifile); } +static const CHAR bin_import_dat[] = "Name\tData\r\n" + "s72\tV0\r\n" + "Binary\tName\r\n" + "filename1\tfilename1.ibd\r\n"; + +static void test_binary_import(void) +{ + MSIHANDLE hdb = 0, rec; + char file[MAX_PATH]; + char buf[MAX_PATH]; + char path[MAX_PATH]; + DWORD size; + LPCSTR query; + UINT r; + + /* create files to import */ + write_file("bin_import.idt", bin_import_dat, + (sizeof(bin_import_dat) - 1) * sizeof(char)); + CreateDirectory("bin_import", NULL); + create_file_data("bin_import/filename1.ibd", "just some words", 15); + + /* import files into database */ + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); + ok( r == ERROR_SUCCESS , "Failed to open database\n"); + + GetCurrentDirectory(MAX_PATH, path); + r = MsiDatabaseImport(hdb, path, "bin_import.idt"); + todo_wine ok(r == ERROR_SUCCESS , "Failed to import Binary table\n"); + + /* read file from the Binary table */ + query = "SELECT * FROM `Binary`"; + r = do_query(hdb, query, &rec); + todo_wine ok(r == ERROR_SUCCESS, "SELECT query failed: %d\n", r); + + size = MAX_PATH; + r = MsiRecordGetString(rec, 1, file, &size); + todo_wine ok(r == ERROR_SUCCESS, "Failed to get string: %d\n", r); + todo_wine ok(!lstrcmp(file, "filename1"), "Expected 'filename1', got %s\n", file); + + size = MAX_PATH; + memset(buf, 0, MAX_PATH); + r = MsiRecordReadStream(rec, 2, buf, &size); + todo_wine ok(r == ERROR_SUCCESS, "Failed to get stream: %d\n", r); + todo_wine ok(!lstrcmp(buf, "just some words"), + "Expected 'just some words', got %s\n", buf); + + r = MsiCloseHandle(rec); + ok(r == ERROR_SUCCESS , "Failed to close record handle\n"); + + r = MsiCloseHandle(hdb); + ok(r == ERROR_SUCCESS , "Failed to close database\n"); + + DeleteFile("bin_import/filename1.ibd"); + RemoveDirectory("bin_import"); + DeleteFile("bin_import.idt"); +} + static void test_markers(void) { MSIHANDLE hdb, rec; @@ -7611,6 +7668,7 @@ START_TEST(db) test_binary(); test_where(); test_msiimport(); + test_binary_import(); test_markers(); test_handle_limit(); test_try_transform();

1 0

Guy Albertelli : kernel32: Fix GetVolumeNameForVolumeMountPointW to match Mountmgr.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: c1f161a678e75f12b9378df9fba7a951c39cf242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1f161a678e75f12b9378df9f… Author: Guy Albertelli <galberte(a)neo.rr.com> Date: Sat May 23 23:45:07 2009 -0400 kernel32: Fix GetVolumeNameForVolumeMountPointW to match Mountmgr. --- dlls/kernel32/tests/volume.c | 14 ++--- dlls/kernel32/volume.c | 126 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 125 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index e447e0f..dab59bc 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -129,7 +129,9 @@ static void test_GetVolumeNameForVolumeMountPointA(void) ok(reti < MAX_PATH, "temp path should fit into MAX_PATH\n"); ret = pGetVolumeNameForVolumeMountPointA(path, volume, 0); - ok(ret == FALSE, "GetVolumeNameForVolumeMountPointA succeeded\n"); + ok(ret == FALSE && GetLastError() == ERROR_FILENAME_EXCED_RANGE, + "GetVolumeNameForVolumeMountPointA succeeded or wrong error, last=%d\n", + GetLastError()); if (0) { /* these crash on XP */ ret = pGetVolumeNameForVolumeMountPointA(path, NULL, len); @@ -147,14 +149,12 @@ static void test_GetVolumeNameForVolumeMountPointA(void) /* test with too small buffer */ ret = pGetVolumeNameForVolumeMountPointA(path, volume, 10); -todo_wine ok(ret == FALSE && GetLastError() == ERROR_FILENAME_EXCED_RANGE, "GetVolumeNameForVolumeMountPointA failed, wrong error returned, was %d, should be ERROR_FILENAME_EXCED_RANGE\n", GetLastError()); /* Try on a arbitrary directory */ ret = pGetVolumeNameForVolumeMountPointA(temp_path, volume, len); -todo_wine ok(ret == FALSE && GetLastError() == ERROR_NOT_A_REPARSE_POINT, "GetVolumeNameForVolumeMountPointA failed on %s, last=%d\n", temp_path, GetLastError()); @@ -169,7 +169,6 @@ todo_wine { path[2] = '\\'; ret = pGetVolumeNameForVolumeMountPointA(path, volume, len); -todo_wine ok(ret == FALSE && GetLastError() == ERROR_FILE_NOT_FOUND, "GetVolumeNameForVolumeMountPointA failed on %s, last=%d\n", path, GetLastError()); @@ -177,7 +176,6 @@ todo_wine /* Try without trailing \ and on a non-existent dos drive */ path[2] = 0; ret = pGetVolumeNameForVolumeMountPointA(path, volume, len); -todo_wine ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME, "GetVolumeNameForVolumeMountPointA failed on %s, last=%d\n", path, GetLastError()); @@ -197,7 +195,9 @@ static void test_GetVolumeNameForVolumeMountPointW(void) } ret = pGetVolumeNameForVolumeMountPointW(path, volume, 0); - ok(ret == FALSE, "GetVolumeNameForVolumeMountPointA succeeded\n"); + ok(ret == FALSE && GetLastError() == ERROR_FILENAME_EXCED_RANGE, + "GetVolumeNameForVolumeMountPointA succeeded or wrong error, last=%d\n", + GetLastError()); if (0) { /* these crash on XP */ ret = pGetVolumeNameForVolumeMountPointW(path, NULL, len); @@ -387,7 +387,6 @@ static void test_enum_vols(void) /* get the unique volume name for the windows drive */ ret = pGetVolumeNameForVolumeMountPointA( path, Volume_1, MAX_PATH ); ok(ret == TRUE, "GetVolumeNameForVolumeMountPointA failed\n"); -todo_wine ok(strlen(Volume_1) == 49, "GetVolumeNameForVolumeMountPointA returned wrong length name %s\n", Volume_1); /* get first unique volume name of list */ @@ -405,7 +404,6 @@ todo_wine break; } } while (pFindNextVolumeA( hFind, Volume_2, MAX_PATH )); -todo_wine ok(found, "volume name %s not found by Find[First/Next]Volume\n", Volume_1); pFindVolumeClose( hFind ); } diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 1b44ace..0f4161c 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -788,20 +788,132 @@ BOOL WINAPI GetVolumeNameForVolumeMountPointA( LPCSTR path, LPSTR volume, DWORD */ BOOL WINAPI GetVolumeNameForVolumeMountPointW( LPCWSTR path, LPWSTR volume, DWORD size ) { + static const WCHAR prefixW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\',0}; + static const WCHAR volumeW[] = {'\\','?','?','\\','V','o','l','u','m','e','{',0}; + static const WCHAR trailingW[] = {'\\',0}; + + MOUNTMGR_MOUNT_POINT *input = NULL, *o1; + MOUNTMGR_MOUNT_POINTS *output = NULL; + WCHAR *p; + char *r; + DWORD i, i_size = 1024, o_size = 1024; + WCHAR nonpersist_name[200]; + WCHAR symlink_name[MAX_PATH]; + NTSTATUS status; + HANDLE mgr = INVALID_HANDLE_VALUE; BOOL ret = FALSE; - static const WCHAR fmt[] = - { '\\','\\','?','\\','V','o','l','u','m','e','{','%','0','2','x','}','\\',0 }; TRACE("(%s, %p, %x)\n", debugstr_w(path), volume, size); + if (path[lstrlenW(path)-1] != '\\') + { + SetLastError( ERROR_INVALID_NAME ); + return FALSE; + } + + if (size < 50) + { + SetLastError( ERROR_FILENAME_EXCED_RANGE ); + return FALSE; + } + /* if length of input is > 3 then it must be a mounted folder */ + if (lstrlenW(path) > 3) + { + FIXME("Mounted Folders are not yet supported\n"); + SetLastError( ERROR_NOT_A_REPARSE_POINT ); + return FALSE; + } + + mgr = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, 0, FILE_SHARE_READ, + NULL, OPEN_EXISTING, 0, 0 ); + if (mgr == INVALID_HANDLE_VALUE) return FALSE; + + if (!(input = HeapAlloc( GetProcessHeap(), 0, i_size ))) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + goto err_ret; + } + + if (!(output = HeapAlloc( GetProcessHeap(), 0, o_size ))) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + goto err_ret; + } + + /* construct the symlink name as "\DosDevices\C:" */ + lstrcpyW( symlink_name, prefixW ); + lstrcatW( symlink_name, path ); + symlink_name[lstrlenW(symlink_name)-1] = 0; + + /* Take the mount point and get the "nonpersistent name" */ + /* We will then take that and get the volume name */ + status = read_nt_symlink( symlink_name, nonpersist_name, + sizeof(nonpersist_name)/sizeof(WCHAR) ); + TRACE("read_nt_symlink got stat=%x, for %s, got <%s>\n", status, + debugstr_w(symlink_name), debugstr_w(nonpersist_name)); + if (status != STATUS_SUCCESS) + { + SetLastError( ERROR_FILE_NOT_FOUND ); + goto err_ret; + } + + /* Now take the "nonpersistent name" and ask the mountmgr */ + /* to give us all the mount points. One of them will be */ + /* the volume name (format of \??\Volume{). */ + memset( input, 0, sizeof(*input) ); /* clear all input parameters */ + input->DeviceNameOffset = sizeof(*input); + input->DeviceNameLength = lstrlenW( nonpersist_name) * sizeof(WCHAR); + memcpy( input + 1, nonpersist_name, input->DeviceNameLength ); + + output->Size = o_size; + + /* now get the true volume name from the mountmgr */ + if (!DeviceIoControl( mgr, IOCTL_MOUNTMGR_QUERY_POINTS, input, i_size, + output, o_size, NULL, NULL )) + goto err_ret; - if (!path || !path[0]) return FALSE; + /* Verify and return the data, note string is not null terminated */ + TRACE("found %d matching mount points\n", output->NumberOfMountPoints); + if (output->NumberOfMountPoints < 1) + { + SetLastError( ERROR_NO_VOLUME_ID ); + goto err_ret; + } + o1 = &output->MountPoints[0]; - if (size >= sizeof(fmt) / sizeof(WCHAR)) + /* look for the volume name in returned values */ + for(i=0;i<output->NumberOfMountPoints;i++) { - /* FIXME: will break when we support volume mounts */ - sprintfW( volume, fmt, tolowerW( path[0] ) - 'a' ); - ret = TRUE; + p = (WCHAR*)((char *)output + o1->SymbolicLinkNameOffset); + r = (char *)output + o1->UniqueIdOffset; + TRACE("found symlink=%s, unique=%s, devname=%s\n", + debugstr_wn(p, o1->SymbolicLinkNameLength/sizeof(WCHAR)), + debugstr_an(r, o1->UniqueIdLength), + debugstr_wn((WCHAR*)((char *)output + o1->DeviceNameOffset), + o1->DeviceNameLength/sizeof(WCHAR))); + + if (!strncmpW( p, volumeW, (sizeof(volumeW)-1)/sizeof(WCHAR) )) + { + /* is there space in the return variable ?? */ + if ((o1->SymbolicLinkNameLength/sizeof(WCHAR))+2 > size) + { + SetLastError( ERROR_FILENAME_EXCED_RANGE ); + goto err_ret; + } + memcpy( volume, p, o1->SymbolicLinkNameLength ); + volume[o1->SymbolicLinkNameLength / sizeof(WCHAR)] = 0; + lstrcatW( volume, trailingW ); + /* change second char from '?' to '\' */ + volume[1] = '\\'; + ret = TRUE; + break; + } + o1++; } + +err_ret: + HeapFree( GetProcessHeap(), 0, input ); + HeapFree( GetProcessHeap(), 0, output ); + CloseHandle( mgr ); return ret; }

1 0

Francois Gouget : riched20: RTFPeekToken(), RTFExpandStyle() and RTFHexToChar() are unused so remove them.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: e5f5bd11538386b0d5f7b985328585f77c21fcdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5f5bd11538386b0d5f7b9853… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 26 00:48:34 2009 +0200 riched20: RTFPeekToken(), RTFExpandStyle() and RTFHexToChar() are unused so remove them. --- dlls/riched20/reader.c | 108 ------------------------------------------------ dlls/riched20/rtf.h | 3 - 2 files changed, 0 insertions(+), 111 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 10aa19e..b6a6f44 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -446,14 +446,6 @@ static void RTFUngetToken(RTF_Info *info) } -int RTFPeekToken(RTF_Info *info) -{ - _RTFGetToken (info); - RTFUngetToken (info); - return (info->rtfClass); -} - - static void _RTFGetToken(RTF_Info *info) { if (info->rtfFormat == SF_TEXT) @@ -758,29 +750,6 @@ static int GetChar(RTF_Info *info) } -/* - * Synthesize a token by setting the global variables to the - * values supplied. Typically this is followed with a call - * to RTFRouteToken(). - * - * If a param value other than rtfNoParam is passed, it becomes - * part of the token text. - */ - -static void RTFSetToken(RTF_Info *info, int class, int major, int minor, int param, const char *text) -{ - info->rtfClass = class; - info->rtfMajor = major; - info->rtfMinor = minor; - info->rtfParam = param; - if (param == rtfNoParam) - lstrcpyA(info->rtfTextBuf, text); - else - sprintf (info->rtfTextBuf, "%s%d", text, param); - info->rtfTextLen = lstrlenA (info->rtfTextBuf); -} - - /* ---------------------------------------------------------------------- */ /* @@ -1244,22 +1213,6 @@ static void ReadObjGroup(RTF_Info *info) * References to style 0 are mapped onto the Normal style. */ - -static RTFStyle *RTFGetStyle(const RTF_Info *info, int num) -{ - RTFStyle *s; - - if (num == -1) - return (info->styleList); - for (s = info->styleList; s != NULL; s = s->rtfNextStyle) - { - if (s->rtfSNum == num) - break; - } - return (s); /* NULL if not found */ -} - - RTFFont *RTFGetFont(const RTF_Info *info, int num) { RTFFont *f; @@ -1292,59 +1245,6 @@ RTFColor *RTFGetColor(const RTF_Info *info, int num) /* ---------------------------------------------------------------------- */ - -/* - * Expand style n, if there is such a style. - */ - -void RTFExpandStyle(RTF_Info *info, int n) -{ - RTFStyle *s; - RTFStyleElt *se; - - if (n == -1) - return; - s = RTFGetStyle (info, n); - if (s == NULL) - return; - if (s->rtfExpanding != 0) - ERR ("Style expansion loop, style %d\n", n); - s->rtfExpanding = 1; /* set expansion flag for loop detection */ - /* - * Expand "based-on" style (unless it's the same as the current - * style -- Normal style usually gives itself as its own based-on - * style). Based-on style expansion is done by synthesizing - * the token that the writer needs to see in order to trigger - * another style expansion, and feeding to token back through - * the router so the writer sees it. - */ - if (n != s->rtfSBasedOn) - { - RTFSetToken (info, rtfControl, rtfParAttr, rtfStyleNum, - s->rtfSBasedOn, "\\s"); - RTFRouteToken (info); - } - /* - * Now route the tokens unique to this style. RTFSetToken() - * isn't used because it would add the param value to the end - * of the token text, which already has it in. - */ - for (se = s->rtfSSEList; se != NULL; se = se->rtfNextSE) - { - info->rtfClass = se->rtfSEClass; - info->rtfMajor = se->rtfSEMajor; - info->rtfMinor = se->rtfSEMinor; - info->rtfParam = se->rtfSEParam; - lstrcpyA (info->rtfTextBuf, se->rtfSEText); - info->rtfTextLen = lstrlenA (info->rtfTextBuf); - RTFRouteToken (info); - } - s->rtfExpanding = 0; /* done - clear expansion flag */ -} - - -/* ---------------------------------------------------------------------- */ - /* * Control symbol lookup routines */ @@ -2397,14 +2297,6 @@ int RTFCharToHex(char c) } -int RTFHexToChar(int i) -{ - if (i < 10) - return (i + '0'); - return (i - 10 + 'a'); -} - - /* ---------------------------------------------------------------------- */ /* diff --git a/dlls/riched20/rtf.h b/dlls/riched20/rtf.h index e8cfb34..3277301 100644 --- a/dlls/riched20/rtf.h +++ b/dlls/riched20/rtf.h @@ -1191,19 +1191,16 @@ void RTFDestroy(RTF_Info *info); void RTFSetDestinationCallback (RTF_Info *, int, RTFFuncPtr); void RTFRead (RTF_Info *); int RTFGetToken (RTF_Info *); /* writer should rarely need this */ -int RTFPeekToken (RTF_Info *); void RTFSetReadHook (RTF_Info *, RTFFuncPtr); void RTFRouteToken (RTF_Info *); void RTFSkipGroup (RTF_Info *); void RTFReadGroup (RTF_Info *); -void RTFExpandStyle (RTF_Info *, int); int RTFCheckCM (const RTF_Info *, int, int); int RTFCheckCMM (const RTF_Info *, int, int, int); int RTFCheckMM (const RTF_Info *, int, int); RTFFont *RTFGetFont (const RTF_Info *, int); RTFColor *RTFGetColor (const RTF_Info *, int); int RTFCharToHex ( char); -int RTFHexToChar ( int ); void RTFFlushOutputBuffer( RTF_Info *info ); void RTFSetEditStream(RTF_Info *info, ME_InStream *stream);

1 0