wine-commits February 2010

wine-commits@winehq.org

2 participants
783 discussions

José Manuel Ferrer Ortiz : iccvid: New Spanish translations.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 7ffbfdb7a05b865d5cfcc09b900bf221acd97de6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ffbfdb7a05b865d5cfcc09b9… Author: José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> Date: Sat Feb 13 01:12:47 2010 +0100 iccvid: New Spanish translations. --- dlls/iccvid/Makefile.in | 1 + dlls/iccvid/iccvid_Es.rc | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/iccvid/Makefile.in b/dlls/iccvid/Makefile.in index 6fdf13d..7096951 100644 --- a/dlls/iccvid/Makefile.in +++ b/dlls/iccvid/Makefile.in @@ -12,6 +12,7 @@ RC_SRCS = \ iccvid_Da.rc \ iccvid_De.rc \ iccvid_En.rc \ + iccvid_Es.rc \ iccvid_Fr.rc \ iccvid_Hu.rc \ iccvid_Ja.rc \ diff --git a/dlls/iccvid/iccvid_Es.rc b/dlls/iccvid/iccvid_Es.rc new file mode 100644 index 0000000..e86d525 --- /dev/null +++ b/dlls/iccvid/iccvid_Es.rc @@ -0,0 +1,30 @@ +/* + * Copyright 2010 José Manuel Ferrer Ortiz + * + * 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 "iccvid_private.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "Códec de vídeo Cinepak" + IDS_DESCRIPTION "Códec de vídeo Cinepak" +}

1 0

José Manuel Ferrer Ortiz : hhctrl.ocx: New Spanish translations.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: a4761f6fdfebeeb5cde7221f0880e4a52e859844 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4761f6fdfebeeb5cde7221f0… Author: José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> Date: Sat Feb 13 01:11:20 2010 +0100 hhctrl.ocx: New Spanish translations. --- dlls/hhctrl.ocx/Es.rc | 63 +++++++++++++++++++++++++++++++++++++++++++ dlls/hhctrl.ocx/Makefile.in | 1 + 2 files changed, 64 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/Es.rc b/dlls/hhctrl.ocx/Es.rc new file mode 100644 index 0000000..d7681aa --- /dev/null +++ b/dlls/hhctrl.ocx/Es.rc @@ -0,0 +1,63 @@ +/* + * HTML Help resources + * Spanish Language Support + * + * Copyright 2010 José Manuel Ferrer Ortiz + * + * 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 "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_CONTENTS "&Contenido" + IDS_INDEX "Í&ndice" + IDS_SEARCH "&Buscar" + IDS_FAVORITES "Favor&itos" +END + +STRINGTABLE +BEGIN + IDTB_EXPAND "Mostrar" + IDTB_CONTRACT "Ocultar" + IDTB_STOP "Parar" + IDTB_REFRESH "Recargar" + IDTB_BACK "Atrás" + IDTB_HOME "Inicio" + IDTB_SYNC "Sincronizar" + IDTB_PRINT "Imprimir" + IDTB_OPTIONS "Opciones" + IDTB_FORWARD "Adelante" + IDTB_NOTES "IDTB_NOTES" + IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" + IDTB_BROWSE_BACK "IDT_BROWSE_BACK" + IDTB_CONTENTS "IDTB_CONTENTS" + IDTB_INDEX "IDTB_INDEX" + IDTB_SEARCH "IDTB_SEARCH" + IDTB_HISTORY "IDTB_HISTORY" + IDTB_FAVORITES "IDTB_FAVORITES" + IDTB_JUMP1 "Jump1" + IDTB_JUMP2 "Jump2" + IDTB_CUSTOMIZE "Personalizar" + IDTB_ZOOM "Zoom" + IDTB_TOC_NEXT "IDTB_TOC_NEXT" + IDTB_TOC_PREV "IDTB_TOC_PREV" +END diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in index 19e6058..1d7f0a2 100644 --- a/dlls/hhctrl.ocx/Makefile.in +++ b/dlls/hhctrl.ocx/Makefile.in @@ -22,6 +22,7 @@ RC_SRCS = \ De.rc \ El.rc \ En.rc \ + Es.rc \ Fi.rc \ Fr.rc \ Hu.rc \

1 0

Alexandre Julliard : ntdll/tests: Use correct access rights in the NtOpenKey test.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 531daa04c2aadb7d2d655efae09c9f182bc482c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=531daa04c2aadb7d2d655efae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 15 12:20:18 2010 +0100 ntdll/tests: Use correct access rights in the NtOpenKey test. --- dlls/ntdll/tests/reg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 48de5a5..8061516 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -350,7 +350,7 @@ static void test_NtOpenKey(void) InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); /* NULL key */ - status = pNtOpenKey(NULL, 0, &attr); + status = pNtOpenKey(NULL, am, &attr); todo_wine ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got: 0x%08x\n", status);

1 0

Ozkan Sezer : include: Make dmoreg.h C++ compatible.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 95a2f9d9515acd0916d2d0f27d56ec8e1d3ac18e URL: http://source.winehq.org/git/wine.git/?a=commit;h=95a2f9d9515acd0916d2d0f27… Author: Ozkan Sezer <sezeroz(a)gmail.com> Date: Sun Feb 14 12:04:51 2010 +0200 include: Make dmoreg.h C++ compatible. --- include/dmoreg.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/dmoreg.h b/include/dmoreg.h index 66966f9..b1fedb8 100644 --- a/include/dmoreg.h +++ b/include/dmoreg.h @@ -21,6 +21,10 @@ #include "mediaobj.h" +#ifdef __cplusplus +extern "C" { +#endif + typedef struct _DMO_PARTIAL_MEDIATYPE { GUID type; @@ -67,4 +71,8 @@ DEFINE_GUID(DMOCATEGORY_AUDIO_NOISE_SUPPRESS, DEFINE_GUID(DMOCATEGORY_AGC, 0xe88c9ba0,0xc557,0x11d0,0x8a,0x2b,0x00,0xa0,0xc9,0x25,0x5a,0xc1); +#ifdef __cplusplus +} +#endif + #endif /* __DMOREG_H__ */

1 0

Ozkan Sezer : include: Another fix for IDirectSound3DBuffer_SetConeAngles.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: f02fd4b5eb41937f5be6dfc95269dc833bb06037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f02fd4b5eb41937f5be6dfc95… Author: Ozkan Sezer <sezeroz(a)gmail.com> Date: Sun Feb 14 12:07:37 2010 +0200 include: Another fix for IDirectSound3DBuffer_SetConeAngles. --- include/dsound.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/dsound.h b/include/dsound.h index 0923561..b594053 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -1098,7 +1098,7 @@ DECLARE_INTERFACE_(IDirectSound3DBuffer,IUnknown) #define IDirectSound3DBuffer_GetPosition(p,a) (p)->GetPosition(a) #define IDirectSound3DBuffer_GetVelocity(p,a) (p)->GetVelocity(a) #define IDirectSound3DBuffer_SetAllParameters(p,a,b) (p)->SetAllParameters(a,b) -#define IDirectSound3DBuffer_SetConeAngles(p,a,b) (p)->SetConeAngles(a,b) +#define IDirectSound3DBuffer_SetConeAngles(p,a,b,c) (p)->SetConeAngles(a,b,c) #define IDirectSound3DBuffer_SetConeOrientation(p,a,b,c,d) (p)->SetConeOrientation(a,b,c,d) #define IDirectSound3DBuffer_SetConeOutsideVolume(p,a,b) (p)->SetConeOutsideVolume(a,b) #define IDirectSound3DBuffer_SetMaxDistance(p,a,b) (p)->SetMaxDistance(a,b)

1 0

Jörg Höhle : winex11: Add vkey codes for functions keys upto F24.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: da49030b39701ccb5696bd1a7e632aa4681751b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da49030b39701ccb5696bd1a7… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Feb 14 21:05:32 2010 +0100 winex11: Add vkey codes for functions keys upto F24. Scancodes 63..6B for F16-F24 were not added because they conflict with the 60.. reassignment heuristic in InitKeyboard. --- dlls/winex11.drv/keyboard.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 86ac83b..5284717 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1023,8 +1023,8 @@ static const WORD nonchar_key_vkey[256] = /* function keys */ VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6, VK_F7, VK_F8, VK_F9, VK_F10, /* FFC0 */ - VK_F11, VK_F12, VK_F13, VK_F14, VK_F15, VK_F16, 0, 0, /* FFC8 */ - 0, 0, 0, 0, 0, 0, 0, 0, /* FFD0 */ + VK_F11, VK_F12, VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, /* FFC8 */ + VK_F19, VK_F20, VK_F21, VK_F22, VK_F23, VK_F24, 0, 0, /* FFD0 */ 0, 0, 0, 0, 0, 0, 0, 0, /* FFD8 */ /* modifier keys */ 0, VK_LSHIFT, VK_RSHIFT, VK_LCONTROL, /* FFE0 */ @@ -1069,7 +1069,7 @@ static const WORD nonchar_key_scan[256] = /* function keys */ 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44, /* FFC0 */ - 0x57, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FFC8 */ + 0x57, 0x58, 0x5B, 0x5C, 0x5D, 0x00, 0x00, 0x00, /* FFC8 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FFD0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FFD8 */ /* modifier keys */

1 0

Jörg Höhle : winex11: Initialize KeyPressEvent for XmbLookupString.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 7155742d70860e6e43941cff406ce3cc21147ead URL: http://source.winehq.org/git/wine.git/?a=commit;h=7155742d70860e6e43941cff4… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Feb 13 22:37:21 2010 +0100 winex11: Initialize KeyPressEvent for XmbLookupString. --- dlls/winex11.drv/keyboard.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 74581cb..86ac83b 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1754,6 +1754,7 @@ void X11DRV_InitKeyboard( Display *display ) e2.display = display; e2.state = 0; + e2.type = KeyPress; memset(keyc2vkey, 0, sizeof(keyc2vkey)); for (keyc = min_keycode; keyc <= max_keycode; keyc++) @@ -2268,6 +2269,7 @@ UINT CDECL X11DRV_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) e.display = display; e.state = 0; e.keycode = 0; + e.type = KeyPress; wine_tsx11_lock();

1 0

Hans Leidekker : msi: Add tests for creating and removing shortcuts.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: b4bdfe67465ef1b49358639d594b431969b99421 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4bdfe67465ef1b49358639d5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 15 10:20:28 2010 +0100 msi: Add tests for creating and removing shortcuts. --- dlls/msi/tests/install.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index c58e0af..8eb2b73 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1364,6 +1364,50 @@ static const CHAR tl_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "PublishProduct\t\t5300\n" "InstallFinalize\t\t6000\n"; +static const CHAR crs_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "target.txt\tshortcut\ttarget.txt\t1000\t\t\t8192\t1\n"; + +static const CHAR crs_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "shortcut\t\t\tshortcut feature\t1\t2\tMSITESTDIR\t0\n"; + +static const CHAR crs_feature_comp_dat[] = "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "shortcut\tshortcut\n"; + +static const CHAR crs_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "shortcut\t{5D20E3C6-7206-498F-AC28-87AF2F9AD4CC}\tMSITESTDIR\t0\t\ttarget.txt\n"; + +static const CHAR crs_shortcut_dat[] = "Shortcut\tDirectory_\tName\tComponent_\tTarget\tArguments\tDescription\tHotkey\tIcon_\tIconIndex\tShowCmd\tWkDir\n" + "s72\ts72\tl128\ts72\ts72\tL255\tL255\tI2\tS72\tI2\tI2\tS72\n" + "Shortcut\tShortcut\n" + "shortcut\tMSITESTDIR\tshortcut\tshortcut\t[MSITESTDIR]target.txt\t\t\t\t\t\t\t\n"; + +static const CHAR crs_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "LaunchConditions\t\t100\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" + "InstallInitialize\t\t1500\n" + "ProcessComponents\t\t1600\n" + "RemoveFiles\t\t1700\n" + "InstallFiles\t\t2000\n" + "RemoveShortcuts\t\t3000\n" + "CreateShortcuts\t\t3100\n" + "RegisterProduct\t\t5000\n" + "PublishFeatures\t\t5100\n" + "PublishProduct\t\t5200\n" + "InstallFinalize\t\t6000\n"; + typedef struct _msi_table { const CHAR *filename; @@ -2188,6 +2232,19 @@ static const msi_table tl_tables[] = ADD_TABLE(property) }; +static const msi_table crs_tables[] = +{ + ADD_TABLE(crs_component), + ADD_TABLE(directory), + ADD_TABLE(crs_feature), + ADD_TABLE(crs_feature_comp), + ADD_TABLE(crs_file), + ADD_TABLE(crs_shortcut), + ADD_TABLE(crs_install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -8094,6 +8151,32 @@ static void test_register_typelib(void) delete_test_files(); } +static void test_create_remove_shortcut(void) +{ + UINT r; + + create_test_files(); + create_file("msitest\\target.txt", 1000); + create_database(msifile, crs_tables, sizeof(crs_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(pf_exists("msitest\\target.txt"), "file not created\n"); + ok(pf_exists("msitest\\shortcut.lnk"), "file not created\n"); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(!delete_pf("msitest\\shortcut.lnk", TRUE), "file not removed\n"); + ok(!delete_pf("msitest\\target.txt", TRUE), "file not removed\n"); + todo_wine ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + + delete_test_files(); +} + START_TEST(install) { DWORD len; @@ -8194,6 +8277,7 @@ START_TEST(install) test_validate_product_id(); test_install_remove_odbc(); test_register_typelib(); + test_create_remove_shortcut(); DeleteFileA(log_file);

1 0

Hans Leidekker : msi: Implement the RemoveShortcuts standard action.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 2276c291fc455c035078503cff970865d5dc866c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2276c291fc455c035078503cf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 15 10:20:01 2010 +0100 msi: Implement the RemoveShortcuts standard action. --- dlls/msi/action.c | 164 ++++++++++++++++++++++++++++++++++------------------ 1 files changed, 107 insertions(+), 57 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 6ee3007..4ddfc82 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3027,19 +3027,47 @@ static UINT ACTION_UnregisterTypeLibraries( MSIPACKAGE *package ) return rc; } +static WCHAR *get_link_file( MSIPACKAGE *package, MSIRECORD *row ) +{ + static const WCHAR szlnk[] = {'.','l','n','k',0}; + LPCWSTR directory, extension; + LPWSTR link_folder, link_file, filename; + + directory = MSI_RecordGetString( row, 2 ); + link_folder = resolve_folder( package, directory, FALSE, FALSE, TRUE, NULL ); + + /* may be needed because of a bug somewhere else */ + create_full_pathW( link_folder ); + + filename = msi_dup_record_field( row, 3 ); + reduce_to_longfilename( filename ); + + extension = strchrW( filename, '.' ); + if (!extension || strcmpiW( extension, szlnk )) + { + int len = strlenW( filename ); + filename = msi_realloc( filename, len * sizeof(WCHAR) + sizeof(szlnk) ); + memcpy( filename + len, szlnk, sizeof(szlnk) ); + } + link_file = build_directory_name( 2, link_folder, filename ); + msi_free( link_folder ); + msi_free( filename ); + + return link_file; +} + static UINT ITERATE_CreateShortcuts(MSIRECORD *row, LPVOID param) { MSIPACKAGE *package = param; - LPWSTR target_file, target_folder, filename; - LPCWSTR buffer, extension; + LPWSTR link_file, deformated, path; + LPCWSTR component, target; MSICOMPONENT *comp; - static const WCHAR szlnk[]={'.','l','n','k',0}; IShellLinkW *sl = NULL; IPersistFile *pf = NULL; HRESULT res; - buffer = MSI_RecordGetString(row,4); - comp = get_loaded_component(package,buffer); + component = MSI_RecordGetString(row, 4); + comp = get_loaded_component(package, component); if (!comp) return ERROR_SUCCESS; @@ -3048,10 +3076,8 @@ static UINT ITERATE_CreateShortcuts(MSIRECORD *row, LPVOID param) TRACE("Skipping shortcut creation due to disabled component\n"); comp->Action = comp->Installed; - return ERROR_SUCCESS; } - comp->Action = INSTALLSTATE_LOCAL; ui_actiondata(package,szCreateShortcuts,row); @@ -3072,31 +3098,10 @@ static UINT ITERATE_CreateShortcuts(MSIRECORD *row, LPVOID param) goto err; } - buffer = MSI_RecordGetString(row,2); - target_folder = resolve_folder(package, buffer,FALSE,FALSE,TRUE,NULL); - - /* may be needed because of a bug somewhere else */ - create_full_pathW(target_folder); - - filename = msi_dup_record_field( row, 3 ); - reduce_to_longfilename(filename); - - extension = strchrW(filename,'.'); - if (!extension || strcmpiW(extension,szlnk)) + target = MSI_RecordGetString(row, 5); + if (strchrW(target, '[')) { - int len = strlenW(filename); - filename = msi_realloc(filename, len * sizeof(WCHAR) + sizeof(szlnk)); - memcpy(filename + len, szlnk, sizeof(szlnk)); - } - target_file = build_directory_name(2, target_folder, filename); - msi_free(target_folder); - msi_free(filename); - - buffer = MSI_RecordGetString(row,5); - if (strchrW(buffer,'[')) - { - LPWSTR deformated; - deformat_string(package,buffer,&deformated); + deformat_string(package, target, &deformated); IShellLinkW_SetPath(sl,deformated); msi_free(deformated); } @@ -3108,17 +3113,16 @@ static UINT ITERATE_CreateShortcuts(MSIRECORD *row, LPVOID param) if (!MSI_RecordIsNull(row,6)) { - LPWSTR deformated; - buffer = MSI_RecordGetString(row,6); - deformat_string(package,buffer,&deformated); + LPCWSTR arguments = MSI_RecordGetString(row, 6); + deformat_string(package, arguments, &deformated); IShellLinkW_SetArguments(sl,deformated); msi_free(deformated); } if (!MSI_RecordIsNull(row,7)) { - buffer = MSI_RecordGetString(row,7); - IShellLinkW_SetDescription(sl,buffer); + LPCWSTR description = MSI_RecordGetString(row, 7); + IShellLinkW_SetDescription(sl, description); } if (!MSI_RecordIsNull(row,8)) @@ -3126,20 +3130,18 @@ static UINT ITERATE_CreateShortcuts(MSIRECORD *row, LPVOID param) if (!MSI_RecordIsNull(row,9)) { - LPWSTR Path; INT index; + LPCWSTR icon = MSI_RecordGetString(row, 9); - buffer = MSI_RecordGetString(row,9); - - Path = build_icon_path(package,buffer); + path = build_icon_path(package, icon); index = MSI_RecordGetInteger(row,10); /* no value means 0 */ if (index == MSI_NULL_INTEGER) index = 0; - IShellLinkW_SetIconLocation(sl,Path,index); - msi_free(Path); + IShellLinkW_SetIconLocation(sl, path, index); + msi_free(path); } if (!MSI_RecordIsNull(row,11)) @@ -3147,18 +3149,19 @@ static UINT ITERATE_CreateShortcuts(MSIRECORD *row, LPVOID param) if (!MSI_RecordIsNull(row,12)) { - LPWSTR Path; - buffer = MSI_RecordGetString(row,12); - Path = resolve_folder(package, buffer, FALSE, FALSE, TRUE, NULL); - if (Path) - IShellLinkW_SetWorkingDirectory(sl,Path); - msi_free(Path); + LPCWSTR wkdir = MSI_RecordGetString(row, 12); + path = resolve_folder(package, wkdir, FALSE, FALSE, TRUE, NULL); + if (path) + IShellLinkW_SetWorkingDirectory(sl, path); + msi_free(path); } - TRACE("Writing shortcut to %s\n",debugstr_w(target_file)); - IPersistFile_Save(pf,target_file,FALSE); + link_file = get_link_file(package, row); - msi_free(target_file); + TRACE("Writing shortcut to %s\n", debugstr_w(link_file)); + IPersistFile_Save(pf, link_file, FALSE); + + msi_free(link_file); err: if (pf) @@ -3193,6 +3196,59 @@ static UINT ACTION_CreateShortcuts(MSIPACKAGE *package) return rc; } +static UINT ITERATE_RemoveShortcuts( MSIRECORD *row, LPVOID param ) +{ + MSIPACKAGE *package = param; + LPWSTR link_file; + LPCWSTR component; + MSICOMPONENT *comp; + + component = MSI_RecordGetString( row, 4 ); + comp = get_loaded_component( package, component ); + if (!comp) + return ERROR_SUCCESS; + + if (!ACTION_VerifyComponentForAction( comp, INSTALLSTATE_ABSENT )) + { + TRACE("Skipping, component not scheduled for uninstall\n"); + + comp->Action = comp->Installed; + return ERROR_SUCCESS; + } + comp->Action = INSTALLSTATE_ABSENT; + + ui_actiondata( package, szRemoveShortcuts, row ); + + link_file = get_link_file( package, row ); + + TRACE("Removing shortcut file %s\n", debugstr_w( link_file )); + if (!DeleteFileW( link_file )) + { + WARN("Failed to remove shortcut file %u\n", GetLastError()); + } + msi_free( link_file ); + + return ERROR_SUCCESS; +} + +static UINT ACTION_RemoveShortcuts( MSIPACKAGE *package ) +{ + UINT rc; + MSIQUERY *view; + static const WCHAR query[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','S','h','o','r','t','c','u','t','`',0}; + + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); + if (rc != ERROR_SUCCESS) + return ERROR_SUCCESS; + + rc = MSI_IterateRecords( view, NULL, ITERATE_RemoveShortcuts, package ); + msiobj_release( &view->hdr ); + + return rc; +} + static UINT ITERATE_PublishIcon(MSIRECORD *row, LPVOID param) { MSIPACKAGE* package = param; @@ -6473,12 +6529,6 @@ static UINT ACTION_RemoveRegistryValues( MSIPACKAGE *package ) return msi_unimplemented_action_stub( package, "RemoveRegistryValues", table ); } -static UINT ACTION_RemoveShortcuts( MSIPACKAGE *package ) -{ - static const WCHAR table[] = { 'S','h','o','r','t','c','u','t',0 }; - return msi_unimplemented_action_stub( package, "RemoveShortcuts", table ); -} - static UINT ACTION_SetODBCFolders( MSIPACKAGE *package ) { static const WCHAR table[] = { 'D','i','r','e','c','t','o','r','y',0 };

1 0

Christian Costa : d3drm: Make IDirect3DRMMeshBuilderImpl_Load handle normals and texture coordinates .
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: e0756602a4d1a247dddd94c707354636c370af25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0756602a4d1a247dddd94c70… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Feb 15 09:48:50 2010 +0100 d3drm: Make IDirect3DRMMeshBuilderImpl_Load handle normals and texture coordinates. Implement IDirect3DRMMeshBuilderImpl_GetTextureCoordinates. --- dlls/d3drm/meshbuilder.c | 98 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 94 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index e5d1307..6eb5d1b 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -35,6 +35,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); typedef struct { + D3DVALUE u; + D3DVALUE v; +} Coords2d; + +typedef struct { const IDirect3DRMMeshBuilderVtbl *lpVtbl; LONG ref; DWORD nb_vertices; @@ -44,6 +49,8 @@ typedef struct { DWORD nb_faces; DWORD face_data_size; LPVOID pFaceData; + DWORD nb_coords2d; + Coords2d* pCoords2d; } IDirect3DRMMeshBuilderImpl; typedef struct { @@ -54,8 +61,11 @@ typedef struct { static const struct IDirect3DRMMeshBuilderVtbl Direct3DRMMeshBuilder_Vtbl; -static const GUID GUID_Header = { 0x3D82AB43, 0x62DA, 0x11CF, { 0xAB, 0x39, 0x00, 0x20, 0xAF, 0x71, 0xE4, 0x33 } }; -static const GUID GUID_Mesh = { 0x3D82AB44, 0x62DA, 0x11CF, { 0xAB, 0x39, 0x00, 0x20, 0xAF, 0x71, 0xE4, 0x33 } }; +static const GUID GUID_Header = { 0x3D82AB43, 0x62DA, 0x11CF, { 0xAB, 0x39, 0x00, 0x20, 0xAF, 0x71, 0xE4, 0x33 } }; +static const GUID GUID_Mesh = { 0x3D82AB44, 0x62DA, 0x11CF, { 0xAB, 0x39, 0x00, 0x20, 0xAF, 0x71, 0xE4, 0x33 } }; +static const GUID GUID_MeshTextureCoords = { 0xF6F23F40, 0x7686, 0x11CF, { 0x8F, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xA3 } }; +static const GUID GUID_MeshMaterialList = { 0xF6F23F42, 0x7686, 0x11CF, { 0x8F, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xA3 } }; +static const GUID GUID_MeshNormals = { 0xF6F23F43, 0x7686, 0x11CF, { 0x8F, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xA3 } }; static char templates[] = { "xof 0302txt 0064" @@ -426,6 +436,8 @@ static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_Load(IDirect3DRMMeshBuilder* if LPDIRECTXFILE pDXFile = NULL; LPDIRECTXFILEENUMOBJECT pEnumObject = NULL; LPDIRECTXFILEDATA pData = NULL; + LPDIRECTXFILEOBJECT pObject = NULL; + LPDIRECTXFILEDATA pData2 = NULL; const GUID* pGuid; DWORD size; Header* pHeader; @@ -442,6 +454,8 @@ static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_Load(IDirect3DRMMeshBuilder* if This->pNormals = NULL; HeapFree(GetProcessHeap(), 0, This->pFaceData); This->pFaceData = NULL; + HeapFree(GetProcessHeap(), 0, This->pCoords2d); + This->pCoords2d = NULL; if (loadflags == D3DRMLOAD_FROMMEMORY) { @@ -536,6 +550,73 @@ static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_Load(IDirect3DRMMeshBuilder* if This->pFaceData = HeapAlloc(GetProcessHeap(), 0, This->face_data_size); memcpy(This->pFaceData, ptr + sizeof(DWORD) + This->nb_vertices * sizeof(D3DVECTOR) + sizeof(DWORD), This->face_data_size); + while (1) + { + hr = IDirectXFileData_GetNextObject(pData, &pObject); + if (hr == DXFILEERR_NOMOREOBJECTS) + { + FIXME("no more object\n"); + break; + } + if (hr != DXFILE_OK) + goto end; + + hr = IDirectXFileObject_QueryInterface(pObject, &IID_IDirectXFileData, (void**)&pData2); + IDirectXFileObject_Release(pObject); + if (hr != DXFILE_OK) + goto end; + + hr = IDirectXFileData_GetType(pData2, &pGuid); + if (hr != DXFILE_OK) + { + IDirectXFileData_Release(pData2); + goto end; + } + + FIXME("toto: Found object type whose GUID = %s\n", debugstr_guid(pGuid)); + + if (!IsEqualGUID(pGuid, &GUID_MeshNormals)) + { + DWORD tmp; + + hr = IDirectXFileData_GetData(pData, NULL, &size, (void**)&ptr); + if (hr != DXFILE_OK) + goto end; + + This->nb_normals = *(DWORD*)ptr; + tmp = *(DWORD*)(ptr + sizeof(DWORD) + This->nb_normals * sizeof(D3DVECTOR)); + + FIXME("MeshNormals: nb_normals = %d, nb_faces_normals = %d\n", This->nb_normals, tmp); + + This->pNormals = HeapAlloc(GetProcessHeap(), 0, This->nb_normals * sizeof(D3DVECTOR)); + memcpy(This->pNormals, ptr + sizeof(DWORD), This->nb_normals * sizeof(D3DVECTOR)); + } + else if(!IsEqualGUID(pGuid, &GUID_MeshTextureCoords)) + { + hr = IDirectXFileData_GetData(pData, NULL, &size, (void**)&ptr); + if (hr != DXFILE_OK) + goto end; + + This->nb_coords2d = *(DWORD*)ptr; + + FIXME("MeshTextureCoords: nb_coords2d = %d\n", This->nb_coords2d); + + This->pCoords2d = HeapAlloc(GetProcessHeap(), 0, This->nb_coords2d * sizeof(Coords2d)); + memcpy(This->pCoords2d, ptr + sizeof(DWORD), This->nb_coords2d * sizeof(Coords2d)); + + } + else if(!IsEqualGUID(pGuid, &GUID_MeshMaterialList)) + { + FIXME("MeshMaterialList not supported yet, ignoring...\n"); + } + else + { + FIXME("Unknown GUID %s, ignoring...\n", debugstr_guid(pGuid)); + } + + IDirectXFileData_Release(pData2); + } + ret = D3DRM_OK; end: @@ -546,19 +627,22 @@ end: if (pDXFile) IDirectXFile_Release(pDXFile); - if (hr != D3DRM_OK) + if (ret != D3DRM_OK) { /* Clean mesh data */ This->nb_vertices = 0; This->nb_normals = 0; This->nb_faces = 0; This->face_data_size = 0; + This->nb_coords2d = 0; HeapFree(GetProcessHeap(), 0, This->pVertices); This->pVertices = NULL; HeapFree(GetProcessHeap(), 0, This->pNormals); This->pNormals = NULL; HeapFree(GetProcessHeap(), 0, This->pFaceData); This->pFaceData = NULL; + HeapFree(GetProcessHeap(), 0, This->pCoords2d); + This->pCoords2d = NULL; } return ret; @@ -826,7 +910,13 @@ static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_GetTextureCoordinates(IDirect3D FIXME("(%p)->(%d,%p,%p): stub\n", This, index, u, v); - return E_NOTIMPL; + if (index >= This->nb_coords2d) + return D3DRMERR_NOTFOUND; + + *u = This->pCoords2d[index].u; + *v = This->pCoords2d[index].v; + + return D3DRM_OK; } static int WINAPI IDirect3DRMMeshBuilderImpl_AddVertex(IDirect3DRMMeshBuilder* iface, D3DVALUE x, D3DVALUE y, D3DVALUE z)

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2010