wine-commits July 2009

wine-commits@winehq.org

4 participants
1067 discussions

Paul Vriens : transl: Show name for Polish locale again.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: tools Branch: master Commit: 8dc806ff75f3daab62c92e0727cb2d46019562ef URL: http://source.winehq.org/git/tools.git/?a=commit;h=8dc806ff75f3daab62c92e07… Author: Paul Vriens <paul(a)acer.famvriens.nl> Date: Sat Jul 4 15:20:04 2009 +0200 transl: Show name for Polish locale again. --- transl/php/devel/dump-locales.php | 2 +- transl/php/dump_locales.php | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/transl/php/devel/dump-locales.php b/transl/php/devel/dump-locales.php index 36a915a..8b27c78 100644 --- a/transl/php/devel/dump-locales.php +++ b/transl/php/devel/dump-locales.php @@ -21,7 +21,7 @@ function res_enum($header, $f) } $LOCALE_NAMES = array(); -$res = new ResFile("../dumps/res/dlls-kernel32-kernel.res"); +$res = new ResFile("../dumps/res/dlls-kernel32.res"); $res->enumResources("res_enum"); ksort($LOCALE_NAMES); echo "<?php<br/># Generated by devel/dump-locales.php<br/>\$LOCALE_NAMES = array();<br/>"; diff --git a/transl/php/dump_locales.php b/transl/php/dump_locales.php index 69963c4..8d1bb90 100644 --- a/transl/php/dump_locales.php +++ b/transl/php/dump_locales.php @@ -89,6 +89,7 @@ $LOCALE_NAMES["013:03"] = "Dutch (Surinam)"; $LOCALE_NAMES["014:01"] = "Norwegian (Bokmal)"; $LOCALE_NAMES["014:02"] = "Norwegian (Nynorsk)"; $LOCALE_NAMES["015:01"] = "Polish"; +$LOCALE_NAMES["015:00"] = $LOCALE_NAMES["015:01"]; # ignore sublangs $LOCALE_NAMES["016:01"] = "Portuguese (Brazil)"; $LOCALE_NAMES["016:02"] = "Portuguese (Portugal)"; $LOCALE_NAMES["017:01"] = "Romansh (Switzerland)";

1 0

Jacek Caban : mshtml: Don't call AutoRegister on GRE directory - it' s no longer needed.
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: 3ab8778ec9384f03eb5ab0a101f1e92597bca7a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ab8778ec9384f03eb5ab0a10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 6 13:41:48 2009 +0200 mshtml: Don't call AutoRegister on GRE directory - it's no longer needed. --- dlls/mshtml/nsembed.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 9a3f396..85a3a0d 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -448,10 +448,6 @@ static BOOL init_xpcom(const PRUnichar *gre_path) if(NS_FAILED(nsres)) ERR("AutoRegister(NULL) failed: %08x\n", nsres); - nsres = nsIComponentRegistrar_AutoRegister(registrar, gre_dir); - if(NS_FAILED(nsres)) - ERR("AutoRegister(gre_dir) failed: %08x\n", nsres); - init_nsio(pCompMgr, registrar); }else { ERR("NS_GetComponentRegistrar failed: %08x\n", nsres);

1 0

Frédéric Delanoy : wineconsole: Fix French translation & UI display.
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: 89260f00bb825965a73d2e0d5194ca0d0f242548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89260f00bb825965a73d2e0d5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 6 12:31:00 2009 +0200 wineconsole: Fix French translation & UI display. --- programs/wineconsole/wineconsole_Fr.rc | 106 ++++++++++++++++--------------- 1 files changed, 55 insertions(+), 51 deletions(-) diff --git a/programs/wineconsole/wineconsole_Fr.rc b/programs/wineconsole/wineconsole_Fr.rc index 63796ec..330436b 100644 --- a/programs/wineconsole/wineconsole_Fr.rc +++ b/programs/wineconsole/wineconsole_Fr.rc @@ -1,6 +1,7 @@ /* * Copyright 2001 Eric Pouech * Copyright 2006 Jonathan Ernst + * Copyright 2009 Frédéric Delanoy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,67 +20,70 @@ #include "wineconsole_res.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE BEGIN -IDS_EDIT, "�&dition" -IDS_DEFAULT, "Par &d�faut" -IDS_PROPERTIES, "&Propri�t�s" +IDS_EDIT, "É&dition" +IDS_DEFAULT, "Par &défaut" +IDS_PROPERTIES, "&Propriétés" IDS_MARK, "&Marquer" IDS_COPY, "&Copier" IDS_PASTE, "C&oller" -IDS_SELECTALL, "&S�lectionner tout" -IDS_SCROLL, "&D�filer" +IDS_SELECTALL, "&Sélectionner tout" +IDS_SCROLL, "&Défiler" IDS_SEARCH, "C&hercher" -IDS_FNT_DISPLAY, "Chaque caract�re a %ld points en largeur et %ld points en hauteur" +IDS_FNT_DISPLAY, "Chaque caractère a %ld pixels de largeur et %ld pixels de hauteur" IDS_FNT_PREVIEW_1, "Ceci est un test" -IDS_FNT_PREVIEW_2, "��" -IDS_DLG_TIT_DEFAULT, "Configuration par d�faut" +IDS_FNT_PREVIEW_2, "éèàôë" +IDS_DLG_TIT_DEFAULT, "Configuration par défaut" IDS_DLG_TIT_CURRENT, "Configuration courante" IDS_DLG_TIT_ERROR, "Erreur de configuration" -IDS_DLG_ERR_SBWINSIZE, "La taille du tampon �cran doit �tre plus grande que celle de la fen�tre" +IDS_DLG_ERR_SBWINSIZE, "La taille du tampon écran doit être plus grande ou égale à celle du tampon de la fenêtre" -IDS_CMD_INVALID_EVENT_ID "wineconsole : Impossible d'analyser l'�v�nement\n" -IDS_CMD_INVALID_BACKEND "wineconsole : Moteur invalide\n" -IDS_CMD_INVALID_OPTION "wineconsole : Option de la ligne de commande non reconnue\n" -IDS_CMD_ABOUT "D�marre un programme dans une console Wine\n" -IDS_CMD_LAUNCH_FAILED "wineconsole : �chec lors du d�marrage du programme %s.\n"\ +IDS_CMD_INVALID_EVENT_ID "wineconsole : impossible de déchiffrer l'identifiant d'événement\n" +IDS_CMD_INVALID_BACKEND "wineconsole : moteur invalide\n" +IDS_CMD_INVALID_OPTION "wineconsole : option de ligne de commande non reconnue\n" +IDS_CMD_ABOUT "Démarre un programme dans une console Wine\n" +IDS_CMD_LAUNCH_FAILED "wineconsole : échec lors du démarrage du programme %s.\n"\ "La commande est invalide.\n" IDS_USAGE_HEADER "\nUsage :\n wineconsole [options] <commande>\n\nOptions :\n" -IDS_USAGE_BACKEND " --backend={user|curses} En choisissant � user � une nouvelle fen�tre sera cr��e, � curses �\n"\ - " essaiera de convertir le terminal courant en console Wine\n" -IDS_USAGE_COMMAND " <command> Le programme Wine � ex�cuter dans la console\n" -IDS_USAGE_FOOTER "\nExemple :\n wineconsole cmd\nD�marre l'interpr�teur de commandes de Wine dans une console Wine\n\n" +IDS_USAGE_BACKEND " --backend={user|curses} Utilisez « user » pour utiliser une nouvelle fenêtre\n"\ + " « curses » pour essayer de convertir le terminal courant en console Wine\n" +IDS_USAGE_COMMAND " <commande> Le programme Wine à exécuter dans la console\n" +IDS_USAGE_FOOTER "\nExemple : « wineconsole cmd » démarre l'interpréteur de commandes de Wine dans une console Wine\n\n" END -IDD_OPTION DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 +IDD_OPTION DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 214, 105 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION " Options " FONT 8, "MS Shell Dlg" { - GROUPBOX "Taille du curseur", -1, 10, 11, 60, 44, BS_GROUPBOX - AUTORADIOBUTTON "&Petit", IDC_OPT_CURSOR_SMALL, 14, 23, 44, 10, WS_TABSTOP - AUTORADIOBUTTON "&Moyen", IDC_OPT_CURSOR_MEDIUM, 14, 33, 44, 10, WS_TABSTOP - AUTORADIOBUTTON "&Grand", IDC_OPT_CURSOR_LARGE, 14, 43, 44, 10, WS_TABSTOP - - GROUPBOX "Contr�le", -1, 75, 11, 125, 44, BS_GROUPBOX - LTEXT "Popup menu", -1, 79, 23, 50, 10 - AUTOCHECKBOX "&Control", IDC_OPT_CONF_CTRL, 129, 23, 60, 10, WS_TABSTOP - AUTOCHECKBOX "S&hift", IDC_OPT_CONF_SHIFT, 129, 33, 60, 10, WS_TABSTOP - LTEXT "�dition rapide", -1, 79, 43, 50, 10 - AUTOCHECKBOX "&activer", IDC_OPT_QUICK_EDIT, 129, 43, 60, 10, WS_TABSTOP - - GROUPBOX "Historique des commandes", -1, 10, 57, 190, 35, BS_GROUPBOX - LTEXT "&Taille de la m�moire tampon :", -1, 14, 67, 78, 18 - EDITTEXT IDC_OPT_HIST_SIZE, 92, 69, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + GROUPBOX "Taille du curseur", -1, 10, 11, 63, 49, BS_GROUPBOX + AUTORADIOBUTTON "&Petit", IDC_OPT_CURSOR_SMALL, 14, 25, 44, 10, WS_TABSTOP + AUTORADIOBUTTON "&Moyen", IDC_OPT_CURSOR_MEDIUM, 14, 35, 44, 10, WS_TABSTOP + AUTORADIOBUTTON "&Grand", IDC_OPT_CURSOR_LARGE, 14, 45, 44, 10, WS_TABSTOP + + GROUPBOX "Contrôle", -1, 75, 11, 129, 49, BS_GROUPBOX + LTEXT "Menu contextuel", -1, 83, 23, 53, 10 + AUTOCHECKBOX "&Control", IDC_OPT_CONF_CTRL, 142, 23, 60, 10, WS_TABSTOP + AUTOCHECKBOX "S&hift", IDC_OPT_CONF_SHIFT, 142, 33, 60, 10, WS_TABSTOP + LTEXT "Édition rapide", -1, 83, 48, 53, 10 + AUTOCHECKBOX "&activer", IDC_OPT_QUICK_EDIT, 142, 48, 60, 10, WS_TABSTOP + + GROUPBOX "Historique des commandes", -1, 10, 62, 194, 35, BS_GROUPBOX + LTEXT "&Nombre de commandes mémorisées :", -1, 14, 72, 78, 18 + EDITTEXT IDC_OPT_HIST_SIZE, 94, 74, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_OPT_HIST_SIZE_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - AUTOCHECKBOX "&Supprimer les doublons", IDC_OPT_HIST_NODOUBLE, 130, 67, 60, 18, WS_TABSTOP|BS_MULTILINE + AUTOCHECKBOX "&Supprimer les doublons", IDC_OPT_HIST_NODOUBLE, 142, 72, 60, 18, WS_TABSTOP|BS_MULTILINE } -IDD_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 +IDD_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 205, 106 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION " Police " FONT 8, "MS Shell Dlg" @@ -90,17 +94,17 @@ FONT 8, "MS Shell Dlg" CONTROL "", IDC_FNT_COLOR_FG, "WineConColorPreview", 0L, 100, 18, 48, 16 CONTROL "", IDC_FNT_COLOR_BK, "WineConColorPreview", 0L, 100, 40, 48, 16 LTEXT "&Taille", -1, 158, 5, 40, 8 - LISTBOX IDC_FNT_LIST_SIZE, 158, 18, 40, 60, WS_VSCROLL + LISTBOX IDC_FNT_LIST_SIZE, 158, 18, 40, 43, WS_VSCROLL CONTROL "", IDC_FNT_PREVIEW, "WineConFontPreview", 0L, 5, 60, 109, 40 - LTEXT "", IDC_FNT_FONT_INFO, 128, 76, 80, 18 + LTEXT "", IDC_FNT_FONT_INFO, 120, 69, 78, 28 } -IDD_CONFIG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 +IDD_CONFIG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 205, 107 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION " Configuration " FONT 8, "MS Shell Dlg" { - GROUPBOX "Taille m�moire tampon �cran", -1, 10, 11, 100, 42, BS_GROUPBOX + GROUPBOX "Taille mémoire tampon écran", -1, 10, 11, 100, 42, BS_GROUPBOX LTEXT "&Largeur :", -1, 14, 25, 54, 9 EDITTEXT IDC_CNF_SB_WIDTH, 68, 23, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_SB_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 @@ -108,7 +112,7 @@ FONT 8, "MS Shell Dlg" EDITTEXT IDC_CNF_SB_HEIGHT, 68, 37, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_SB_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - GROUPBOX "Taille de la fen�tre", -1, 10, 55, 100, 42 + GROUPBOX "Taille de la fenêtre", -1, 10, 55, 100, 42 LTEXT "La&rgeur :", -1, 14, 69, 54, 9 EDITTEXT IDC_CNF_WIN_WIDTH, 68, 67, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_WIN_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 @@ -117,21 +121,21 @@ FONT 8, "MS Shell Dlg" CONTROL "", IDC_CNF_WIN_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 GROUPBOX "Fin du programme", -1, 115, 11, 80, 42, BS_GROUPBOX - AUTOCHECKBOX "&Fermer la console", IDC_CNF_CLOSE_EXIT, 119, 25, 75, 20, WS_TABSTOP + AUTOCHECKBOX "&Fermer la console", IDC_CNF_CLOSE_EXIT, 119, 25, 70, 20, WS_TABSTOP - GROUPBOX "�dition", -1, 115, 55, 80, 42 - COMBOBOX IDC_CNF_EDITION_MODE, 119, 69, 75, 20, CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + GROUPBOX "Édition", -1, 115, 55, 80, 42 + COMBOBOX IDC_CNF_EDITION_MODE, 119, 69, 73, 13, CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP } -IDD_SAVE_SETTINGS DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 200, 60 +IDD_SAVE_SETTINGS DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 206, 60 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION -CAPTION "Param�tres de la console" +CAPTION "Paramètres de la console" FONT 8, "MS Shell Dlg" { - GROUPBOX "", -1, 10, 10, 180, 31, BS_GROUPBOX - AUTORADIOBUTTON "Sauver les param�tres pour les prochaines sessions", IDC_SAV_SAVE, 14, 15, 170, 10, WS_TABSTOP - AUTORADIOBUTTON "Appliquer uniquement � la session courante", IDC_SAV_SESSION, 14, 27, 170, 10, WS_TABSTOP + GROUPBOX "", -1, 10, 10, 185, 31, BS_GROUPBOX + AUTORADIOBUTTON "Sauver les paramètres pour les prochaines sessions", IDC_SAV_SAVE, 14, 15, 180, 10, WS_TABSTOP + AUTORADIOBUTTON "Appliquer uniquement à la session courante", IDC_SAV_SESSION, 14, 27, 180, 10, WS_TABSTOP - PUSHBUTTON "OK", IDOK, 50, 45, 35, 12 - PUSHBUTTON "Annuler", IDCANCEL, 115, 45, 35, 12 + PUSHBUTTON "OK", IDOK, 55, 45, 35, 12 + PUSHBUTTON "Annuler", IDCANCEL, 120, 45, 35, 12 }

1 0

Hib Eris : msi: Implement ASSIGN mode in MsiViewModify.
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: ec4edbfd6c35a76327bf06e7677170afa5aad265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec4edbfd6c35a76327bf06e76… Author: Hib Eris <hib(a)hiberis.nl> Date: Mon Jul 6 12:26:20 2009 +0200 msi: Implement ASSIGN mode in MsiViewModify. --- dlls/msi/table.c | 18 ++++++++++++++++++ dlls/msi/tests/db.c | 16 ++++++++-------- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index dc21b3b..126769a 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1711,6 +1711,21 @@ static UINT msi_table_update(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row) return TABLE_set_row(view, new_row, rec, (1 << tv->num_cols) - 1); } +static UINT msi_table_assign(struct tagMSIVIEW *view, MSIRECORD *rec) +{ + MSITABLEVIEW *tv = (MSITABLEVIEW *)view; + UINT r, row; + + if (!tv->table) + return ERROR_INVALID_PARAMETER; + + r = msi_table_find_row(tv, rec, &row); + if (r == ERROR_SUCCESS) + return TABLE_set_row(view, row, rec, (1 << tv->num_cols) - 1); + else + return TABLE_insert_row( view, rec, -1, FALSE ); +} + static UINT modify_delete_row( struct tagMSIVIEW *view, MSIRECORD *rec ) { MSITABLEVIEW *tv = (MSITABLEVIEW *)view; @@ -1780,6 +1795,9 @@ static UINT TABLE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, break; case MSIMODIFY_ASSIGN: + r = msi_table_assign( view, rec ); + break; + case MSIMODIFY_REPLACE: case MSIMODIFY_MERGE: case MSIMODIFY_VALIDATE: diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index e694ea3..019ff5e 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -4795,7 +4795,7 @@ static void test_viewmodify_assign(void) ok(r == ERROR_SUCCESS, "failed to set integer\n"); r = MsiViewModify(hview, MSIMODIFY_ASSIGN, hrec); - todo_wine ok(r == ERROR_SUCCESS, "MsiViewModify failed: %d\n", r); + ok(r == ERROR_SUCCESS, "MsiViewModify failed: %d\n", r); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n"); @@ -4811,12 +4811,12 @@ static void test_viewmodify_assign(void) r = MsiViewExecute(hview, 0); ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); r = MsiViewFetch(hview, &hrec); - todo_wine ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); r = MsiRecordGetInteger(hrec, 1); - todo_wine ok(r == 1, "Expected 1, got %d\n", r); + ok(r == 1, "Expected 1, got %d\n", r); r = MsiRecordGetInteger(hrec, 2); - todo_wine ok(r == 2, "Expected 2, got %d\n", r); + ok(r == 2, "Expected 2, got %d\n", r); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n"); @@ -4845,7 +4845,7 @@ static void test_viewmodify_assign(void) ok(r == ERROR_SUCCESS, "failed to set integer\n"); r = MsiViewModify(hview, MSIMODIFY_ASSIGN, hrec); - todo_wine ok(r == ERROR_SUCCESS, "MsiViewModify failed: %d\n", r); + ok(r == ERROR_SUCCESS, "MsiViewModify failed: %d\n", r); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n"); @@ -4861,12 +4861,12 @@ static void test_viewmodify_assign(void) r = MsiViewExecute(hview, 0); ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); r = MsiViewFetch(hview, &hrec); - todo_wine ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); r = MsiRecordGetInteger(hrec, 1); - todo_wine ok(r == 1, "Expected 1, got %d\n", r); + ok(r == 1, "Expected 1, got %d\n", r); r = MsiRecordGetInteger(hrec, 2); - todo_wine ok(r == 4, "Expected 4, got %d\n", r); + ok(r == 4, "Expected 4, got %d\n", r); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n");

1 0

Hib Eris : msi/tests: Add tests for MsiViewModify ASSIGN mode.
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: eaea537f0f0cbefc55b5fb8bb023e2cd779f810d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaea537f0f0cbefc55b5fb8bb… Author: Hib Eris <hib(a)hiberis.nl> Date: Mon Jul 6 12:24:48 2009 +0200 msi/tests: Add tests for MsiViewModify ASSIGN mode. --- dlls/msi/tests/db.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 122 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 43b5648..e694ea3 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -4763,6 +4763,127 @@ static void test_viewmodify_update(void) ok(r == ERROR_SUCCESS, "MsiOpenDatabase close failed\n"); } +static void test_viewmodify_assign(void) +{ + MSIHANDLE hdb = 0, hview = 0, hrec = 0; + const char *query; + UINT r; + + /* setup database */ + DeleteFile(msifile); + + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "MsiOpenDatabase failed\n"); + + query = "CREATE TABLE `table` (`A` INT, `B` INT PRIMARY KEY `A`)"; + r = run_query( hdb, 0, query ); + ok(r == ERROR_SUCCESS, "query failed\n"); + + /* assign to view, new primary key */ + query = "SELECT * FROM `table`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + + hrec = MsiCreateRecord(2); + ok(hrec != 0, "MsiCreateRecord failed\n"); + + r = MsiRecordSetInteger(hrec, 1, 1); + ok(r == ERROR_SUCCESS, "failed to set integer\n"); + r = MsiRecordSetInteger(hrec, 2, 2); + ok(r == ERROR_SUCCESS, "failed to set integer\n"); + + r = MsiViewModify(hview, MSIMODIFY_ASSIGN, hrec); + todo_wine ok(r == ERROR_SUCCESS, "MsiViewModify failed: %d\n", r); + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + query = "SELECT * FROM `table`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + r = MsiViewFetch(hview, &hrec); + todo_wine ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + + r = MsiRecordGetInteger(hrec, 1); + todo_wine ok(r == 1, "Expected 1, got %d\n", r); + r = MsiRecordGetInteger(hrec, 2); + todo_wine ok(r == 2, "Expected 2, got %d\n", r); + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + /* assign to view, primary key matches */ + query = "SELECT * FROM `table`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + + hrec = MsiCreateRecord(2); + ok(hrec != 0, "MsiCreateRecord failed\n"); + + r = MsiRecordSetInteger(hrec, 1, 1); + ok(r == ERROR_SUCCESS, "failed to set integer\n"); + r = MsiRecordSetInteger(hrec, 2, 4); + ok(r == ERROR_SUCCESS, "failed to set integer\n"); + + r = MsiViewModify(hview, MSIMODIFY_ASSIGN, hrec); + todo_wine ok(r == ERROR_SUCCESS, "MsiViewModify failed: %d\n", r); + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + query = "SELECT * FROM `table`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + r = MsiViewFetch(hview, &hrec); + todo_wine ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + + r = MsiRecordGetInteger(hrec, 1); + todo_wine ok(r == 1, "Expected 1, got %d\n", r); + r = MsiRecordGetInteger(hrec, 2); + todo_wine ok(r == 4, "Expected 4, got %d\n", r); + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + /* close database */ + r = MsiCloseHandle( hdb ); + ok(r == ERROR_SUCCESS, "MsiOpenDatabase close failed\n"); +} + static const WCHAR data10[] = { /* MOO */ 0x8001, 0x000b, }; @@ -8099,6 +8220,7 @@ START_TEST(db) test_tables_order(); test_select_markers(); test_viewmodify_update(); + test_viewmodify_assign(); test_stringtable(); test_viewmodify_delete(); test_defaultdatabase();

1 0

Roderick Colenbrander : winex11: Move glyph code over to get_xrender_format .
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: e13865285eae43abd8d0b04dcb6182e0b0694e78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e13865285eae43abd8d0b04dc… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Jul 5 21:03:48 2009 +0200 winex11: Move glyph code over to get_xrender_format. --- dlls/winex11.drv/xrender.c | 71 ++++++++++++++++---------------------------- 1 files changed, 26 insertions(+), 45 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index afbadb3..dd53f23 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -54,10 +54,11 @@ static BOOL X11DRV_XRender_Installed = FALSE; #define RepeatReflect 3 #endif -#define MAX_FORMATS 9 +#define MAX_FORMATS 10 typedef enum wine_xrformat { WXR_FORMAT_MONO, + WXR_FORMAT_GRAY, WXR_FORMAT_X1R5G5B5, WXR_FORMAT_X1B5G5R5, WXR_FORMAT_R5G6B5, @@ -86,6 +87,7 @@ static const WineXRenderFormatTemplate wxr_formats_template[] = { /* Format depth alpha mask red mask green mask blue mask*/ {WXR_FORMAT_MONO, 1, 0, 0x01, 0, 0, 0, 0, 0, 0 }, + {WXR_FORMAT_GRAY, 8, 0, 0xff, 0, 0, 0, 0, 0, 0 }, {WXR_FORMAT_X1R5G5B5, 16, 0, 0, 10, 0x1f, 5, 0x1f, 0, 0x1f }, {WXR_FORMAT_X1B5G5R5, 16, 0, 0, 0, 0x1f, 5, 0x1f, 10, 0x1f }, {WXR_FORMAT_R5G6B5, 16, 0, 0, 11, 0x1f, 5, 0x3f, 0, 0x1f }, @@ -121,7 +123,7 @@ typedef enum { AA_None = 0, AA_Grey, AA_RGB, AA_BGR, AA_VRGB, AA_VBGR, AA_MAXVAL typedef struct { GlyphSet glyphset; - XRenderPictFormat *font_format; + WineXRenderFormat *font_format; int nrealized; BOOL *realized; void **bitmaps; @@ -828,8 +830,7 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format) gsCacheEntry *entry = glyphsetCache + physDev->xrender->cache_index; gsCacheEntryFormat *formatEntry; UINT ggo_format = GGO_GLYPH_INDEX; - XRenderPictFormat pf; - unsigned long pf_mask; + WXRFormat wxr_format; static const char zero[4]; static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; @@ -918,48 +919,28 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format) if(formatEntry->glyphset == 0 && X11DRV_XRender_Installed) { switch(format) { - case AA_Grey: - pf_mask = PictFormatType | PictFormatDepth | PictFormatAlpha | PictFormatAlphaMask, - pf.type = PictTypeDirect; - pf.depth = 8; - pf.direct.alpha = 0; - pf.direct.alphaMask = 0xff; - break; - - case AA_RGB: - case AA_BGR: - case AA_VRGB: - case AA_VBGR: - pf_mask = PictFormatType | PictFormatDepth | PictFormatRed | PictFormatRedMask | - PictFormatGreen | PictFormatGreenMask | PictFormatBlue | - PictFormatBlueMask | PictFormatAlpha | PictFormatAlphaMask; - pf.type = PictTypeDirect; - pf.depth = 32; - pf.direct.red = 16; - pf.direct.redMask = 0xff; - pf.direct.green = 8; - pf.direct.greenMask = 0xff; - pf.direct.blue = 0; - pf.direct.blueMask = 0xff; - pf.direct.alpha = 24; - pf.direct.alphaMask = 0xff; - break; + case AA_Grey: + wxr_format = WXR_FORMAT_GRAY; + break; - default: - ERR("aa = %d - not implemented\n", format); - case AA_None: - pf_mask = PictFormatType | PictFormatDepth | PictFormatAlpha | PictFormatAlphaMask, - pf.type = PictTypeDirect; - pf.depth = 1; - pf.direct.alpha = 0; - pf.direct.alphaMask = 1; - break; - } + case AA_RGB: + case AA_BGR: + case AA_VRGB: + case AA_VBGR: + wxr_format = WXR_FORMAT_A8R8G8B8; + break; - wine_tsx11_lock(); - formatEntry->font_format = pXRenderFindFormat(gdi_display, pf_mask, &pf, 0); - formatEntry->glyphset = pXRenderCreateGlyphSet(gdi_display, formatEntry->font_format); - wine_tsx11_unlock(); + default: + ERR("aa = %d - not implemented\n", format); + case AA_None: + wxr_format = WXR_FORMAT_MONO; + break; + } + + wine_tsx11_lock(); + formatEntry->font_format = get_xrender_format(wxr_format); + formatEntry->glyphset = pXRenderCreateGlyphSet(gdi_display, formatEntry->font_format->pict_format); + wine_tsx11_unlock(); } @@ -1571,7 +1552,7 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag pXRenderCompositeText16(gdi_display, render_op, tile_pict, physDev->xrender->pict, - formatEntry->font_format, + formatEntry->font_format->pict_format, 0, 0, 0, 0, elts, count); wine_tsx11_unlock(); HeapFree(GetProcessHeap(), 0, elts);

1 0

Roderick Colenbrander : winex11: Move AlphaBlend over to get_xrender_format .
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: bf86daa0b676533d8c7f7f68e1825e28751b106b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf86daa0b676533d8c7f7f68e… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Jul 5 20:52:19 2009 +0200 winex11: Move AlphaBlend over to get_xrender_format. --- dlls/winex11.drv/xrender.c | 44 ++++++++------------------------------------ 1 files changed, 8 insertions(+), 36 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index e3d2105..afbadb3 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1739,35 +1739,6 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid BLENDFUNCTION blendfn) { XRenderPictureAttributes pa; - XRenderPictFormat *src_format; - XRenderPictFormat argb32_templ = { - 0, /* id */ - PictTypeDirect, /* type */ - 32, /* depth */ - { /* direct */ - 16, /* direct.red */ - 0xff, /* direct.redMask */ - 8, /* direct.green */ - 0xff, /* direct.greenMask */ - 0, /* direct.blue */ - 0xff, /* direct.blueMask */ - 24, /* direct.alpha */ - 0xff, /* direct.alphaMask */ - }, - 0, /* colormap */ - }; - unsigned long argb32_templ_mask = - PictFormatType | - PictFormatDepth | - PictFormatRed | - PictFormatRedMask | - PictFormatGreen | - PictFormatGreenMask | - PictFormatBlue | - PictFormatBlueMask | - PictFormatAlpha | - PictFormatAlphaMask; - Picture dst_pict, src_pict; Pixmap xpm; DIBSECTION dib; @@ -1780,6 +1751,7 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid BOOL top_down = FALSE; RGNDATA *rgndata; WineXRenderFormat *dst_format = get_xrender_format_from_pdevice(devDst); + WineXRenderFormat *src_format; int repeat_src; if(!X11DRV_XRender_Installed) { @@ -1896,13 +1868,13 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid image = XCreateImage(gdi_display, visual, 32, ZPixmap, 0, (char*) data, widthSrc, heightSrc, 32, widthSrc * 4); - /* - Avoid using XRenderFindStandardFormat as older libraries don't have it - src_format = pXRenderFindStandardFormat(gdi_display, PictStandardARGB32); - */ - src_format = pXRenderFindFormat(gdi_display, argb32_templ_mask, &argb32_templ, 0); - + src_format = get_xrender_format(WXR_FORMAT_A8R8G8B8); TRACE("src_format %p\n", src_format); + if(!src_format) + { + WARN("Unable to find a picture format supporting alpha, make sure X is running at 24-bit\n"); + return FALSE; + } pa.subwindow_mode = IncludeInferiors; pa.repeat = repeat_src ? RepeatNormal : RepeatNone; @@ -1923,7 +1895,7 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid XPutImage(gdi_display, xpm, gc, image, 0, 0, 0, 0, widthSrc, heightSrc); src_pict = pXRenderCreatePicture(gdi_display, - xpm, src_format, + xpm, src_format->pict_format, CPSubwindowMode|CPRepeat, &pa); TRACE("src_pict %08lx\n", src_pict);

1 0

Roderick Colenbrander : winex11: Get rid of the static Xrender picture format table.
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: 8262e0a80067e75d3ff81ab4292907db9e95d157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8262e0a80067e75d3ff81ab42… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Jul 5 20:35:01 2009 +0200 winex11: Get rid of the static Xrender picture format table. --- dlls/winex11.drv/xrender.c | 245 +++++++++++++++++++++++++++++++++++--------- 1 files changed, 197 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8262e0a80067e75d3ff81…

1 0

Alexandre Julliard : kernel32: Forward the Wow64 redirection functions to ntdll.
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: 26caf2fdda95f1934e329aa27f4d681d09390ebe URL: http://source.winehq.org/git/wine.git/?a=commit;h=26caf2fdda95f1934e329aa27… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 6 15:09:29 2009 +0200 kernel32: Forward the Wow64 redirection functions to ntdll. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/path.c | 25 +++++++++++++++++++------ include/winbase.h | 3 +++ 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 5182e71..fc3b6ae 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1144,6 +1144,7 @@ @ stdcall WaitNamedPipeW (wstr long) @ stdcall WideCharToMultiByte(long long wstr long ptr long ptr ptr) @ stdcall WinExec(str long) +@ stdcall Wow64EnableWow64FsRedirection(long) @ stdcall Wow64DisableWow64FsRedirection(ptr) @ stdcall Wow64RevertWow64FsRedirection(ptr) @ stdcall WriteConsoleA(long ptr long ptr ptr) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 2633d90..0b3a87e 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1539,24 +1539,37 @@ UINT WINAPI GetSystemWow64DirectoryA( LPSTR lpBuffer, UINT uSize ) return 0; } + +/*********************************************************************** + * Wow64EnableWow64FsRedirection (KERNEL32.@) + */ +BOOLEAN WINAPI Wow64EnableWow64FsRedirection( BOOLEAN enable ) +{ + NTSTATUS status = RtlWow64EnableFsRedirection( enable ); + if (status) SetLastError( RtlNtStatusToDosError(status) ); + return !status; +} + + /*********************************************************************** * Wow64DisableWow64FsRedirection (KERNEL32.@) */ BOOL WINAPI Wow64DisableWow64FsRedirection( PVOID *old_value ) { - FIXME("%p\n", old_value); - - if (old_value) *old_value = (void *)0xdeadbeef; - return TRUE; + NTSTATUS status = RtlWow64EnableFsRedirectionEx( TRUE, (ULONG *)old_value ); + if (status) SetLastError( RtlNtStatusToDosError(status) ); + return !status; } + /*********************************************************************** * Wow64RevertWow64FsRedirection (KERNEL32.@) */ BOOL WINAPI Wow64RevertWow64FsRedirection( PVOID old_value ) { - FIXME("%p\n", old_value); - return TRUE; + NTSTATUS status = RtlWow64EnableFsRedirection( (UINT_PTR)old_value ); + if (status) SetLastError( RtlNtStatusToDosError(status) ); + return !status; } diff --git a/include/winbase.h b/include/winbase.h index 0794fc6..a7eaf9d 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2143,6 +2143,9 @@ WINBASEAPI BOOL WINAPI WaitNamedPipeA(LPCSTR,DWORD); WINBASEAPI BOOL WINAPI WaitNamedPipeW(LPCWSTR,DWORD); #define WaitNamedPipe WINELIB_NAME_AW(WaitNamedPipe) WINBASEAPI UINT WINAPI WinExec(LPCSTR,UINT); +WINBASEAPI BOOL WINAPI Wow64DisableWow64FsRedirection(PVOID*); +WINBASEAPI BOOLEAN WINAPI Wow64EnableWow64FsRedirection(BOOLEAN); +WINBASEAPI BOOL WINAPI Wow64RevertWow64FsRedirection(PVOID); WINBASEAPI BOOL WINAPI WriteFile(HANDLE,LPCVOID,DWORD,LPDWORD,LPOVERLAPPED); WINBASEAPI BOOL WINAPI WriteFileEx(HANDLE,LPCVOID,DWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE); WINBASEAPI BOOL WINAPI WriteFileGather(HANDLE,FILE_SEGMENT_ELEMENT*,DWORD,LPDWORD,LPOVERLAPPED);

1 0

Alexandre Julliard : ntdll: Add management of the Wow64 filesystem redirection flag.
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: 747d58d211e76a7c06b2cd412dd43f4d71bbd82e URL: http://source.winehq.org/git/wine.git/?a=commit;h=747d58d211e76a7c06b2cd412… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 6 15:08:39 2009 +0200 ntdll: Add management of the Wow64 filesystem redirection flag. --- dlls/ntdll/directory.c | 23 +++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/ntdll_misc.h | 7 ++++--- dlls/ntdll/process.c | 6 +----- dlls/ntdll/server.c | 8 +++++++- include/winternl.h | 2 ++ 6 files changed, 39 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 41880f4..bccfba6 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2130,6 +2130,29 @@ done: /****************************************************************** + * RtlWow64EnableFsRedirection (NTDLL.@) + */ +NTSTATUS WINAPI RtlWow64EnableFsRedirection( BOOLEAN enable ) +{ + if (!is_wow64) return STATUS_NOT_IMPLEMENTED; + ntdll_get_thread_data()->wow64_redir = enable; + return STATUS_SUCCESS; +} + + +/****************************************************************** + * RtlWow64EnableFsRedirectionEx (NTDLL.@) + */ +NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx( ULONG enable, ULONG *old_value ) +{ + if (!is_wow64) return STATUS_NOT_IMPLEMENTED; + *old_value = ntdll_get_thread_data()->wow64_redir; + ntdll_get_thread_data()->wow64_redir = enable; + return STATUS_SUCCESS; +} + + +/****************************************************************** * RtlDoesFileExists_U (NTDLL.@) */ BOOLEAN WINAPI RtlDoesFileExists_U(LPCWSTR file_name) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index acc69db..03686b2 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -913,6 +913,8 @@ @ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) @ stub RtlWalkFrameChain @ stdcall RtlWalkHeap(long ptr) +@ stdcall RtlWow64EnableFsRedirection(long) +@ stdcall RtlWow64EnableFsRedirectionEx(long ptr) @ stub RtlWriteMemoryStream @ stdcall RtlWriteRegistryValue(long ptr ptr long ptr long) @ stub RtlZeroHeap diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 8da7148..3032553 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -71,7 +71,7 @@ extern void virtual_init_threading(void); /* server support */ extern timeout_t server_start_time; -extern unsigned int server_cpus; +extern int is_wow64; extern void server_init_process(void); extern NTSTATUS server_init_process_done(void); extern size_t server_init_thread( void *entry_point ); @@ -198,8 +198,9 @@ struct ntdll_thread_data int request_fd; /* 1e0/310 fd for sending server requests */ int reply_fd; /* 1e4/314 fd for receiving server replies */ int wait_fd[2]; /* 1e8/318 fd for sleeping server requests */ - void *vm86_ptr; /* 1f0/320 data for vm86 mode */ - pthread_t pthread_id; /* 1f4/328 pthread thread id */ + BOOL wow64_redir; /* 1f0/320 Wow64 filesystem redirection flag */ + void *vm86_ptr; /* 1f4/328 data for vm86 mode */ + pthread_t pthread_id; /* 1f8/330 pthread thread id */ }; static inline struct ntdll_thread_data *ntdll_get_thread_data(void) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index c129e0a..9ec5513 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -307,11 +307,7 @@ NTSTATUS WINAPI NtQueryInformationProcess( case ProcessWow64Information: if (ProcessInformationLength == sizeof(DWORD)) { -#ifdef __i386__ - *(DWORD *)ProcessInformation = (server_cpus & (1 << CPU_x86_64)) != 0; -#else - *(DWORD *)ProcessInformation = FALSE; -#endif + *(DWORD *)ProcessInformation = is_wow64; len = sizeof(DWORD); } else ret = STATUS_INFO_LENGTH_MISMATCH; diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index e90ea72..a4f2953 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -94,7 +94,8 @@ static const enum cpu_type client_cpu = CPU_SPARC; #error Unsupported CPU #endif -unsigned int server_cpus = 0; +static unsigned int server_cpus; +int is_wow64 = FALSE; #ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS /* data structure used to pass an fd with sendmsg/recvmsg */ @@ -1081,6 +1082,11 @@ size_t server_init_thread( void *entry_point ) } SERVER_END_REQ; +#ifndef _WIN64 + is_wow64 = (server_cpus & (1 << CPU_x86_64)) != 0; +#endif + ntdll_get_thread_data()->wow64_redir = is_wow64; + if (ret) { if (ret == STATUS_NOT_SUPPORTED) diff --git a/include/winternl.h b/include/winternl.h index b386787..6d0b480 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2512,6 +2512,8 @@ NTSYSAPI BOOLEAN WINAPI RtlValidSid(PSID); NTSYSAPI BOOLEAN WINAPI RtlValidateHeap(HANDLE,ULONG,LPCVOID); NTSYSAPI NTSTATUS WINAPI RtlVerifyVersionInfo(const RTL_OSVERSIONINFOEXW*,DWORD,DWORDLONG); NTSYSAPI NTSTATUS WINAPI RtlWalkHeap(HANDLE,PVOID); +NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirection(BOOLEAN); +NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx(ULONG,ULONG*); NTSYSAPI NTSTATUS WINAPI RtlWriteRegistryValue(ULONG,PCWSTR,PCWSTR,ULONG,PVOID,ULONG); NTSYSAPI NTSTATUS WINAPI RtlpNtCreateKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG,const UNICODE_STRING*,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI RtlpNtEnumerateSubKey(HANDLE,UNICODE_STRING *, ULONG);

1 0

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 July 2009