October 2010 - Wine-commits

Hans Leidekker : include: Add rendering intent defines.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: 1a7300b4b696e3340c767cb18a1c75099c3c30f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a7300b4b696e3340c767cb18… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 22 10:37:16 2010 +0200 include: Add rendering intent defines. --- include/icm.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/icm.h b/include/icm.h index a08d045..34b0b63 100644 --- a/include/icm.h +++ b/include/icm.h @@ -179,6 +179,11 @@ typedef enum typedef BOOL (CALLBACK *PBMCALLBACKFN)(ULONG,ULONG,LPARAM); typedef PBMCALLBACKFN LPPBMCALLBACKFN; +#define INTENT_PERCEPTUAL 0 +#define INTENT_RELATIVE_COLORIMETRIC 1 +#define INTENT_SATURATION 2 +#define INTENT_ABSOLUTE_COLORIMETRIC 3 + typedef struct tagPROFILEHEADER { DWORD phSize;

1 0

David Adam : ddraw: SETFOCUSWINDOW lives independently of other flags.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: 0a90271d6984d047893b6d93d2baa5d20dadfac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a90271d6984d047893b6d93d… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Oct 22 08:32:39 2010 +0200 ddraw: SETFOCUSWINDOW lives independently of other flags. --- dlls/ddraw/ddraw.c | 24 ++++++++++++++---------- dlls/ddraw/tests/ddrawmodes.c | 7 +++++++ 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 346c7c5..1f88fa5 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -586,21 +586,23 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, if(cooplevel & DDSCL_SETFOCUSWINDOW) { /* This isn't compatible with a lot of flags */ - if(cooplevel & ( DDSCL_MULTITHREADED | - DDSCL_FPUSETUP | - DDSCL_FPUPRESERVE | - DDSCL_ALLOWREBOOT | - DDSCL_ALLOWMODEX | - DDSCL_SETDEVICEWINDOW | - DDSCL_NORMAL | - DDSCL_EXCLUSIVE | - DDSCL_FULLSCREEN ) ) + if(cooplevel & ( DDSCL_MULTITHREADED | + DDSCL_CREATEDEVICEWINDOW | + DDSCL_FPUSETUP | + DDSCL_FPUPRESERVE | + DDSCL_ALLOWREBOOT | + DDSCL_ALLOWMODEX | + DDSCL_SETDEVICEWINDOW | + DDSCL_NORMAL | + DDSCL_EXCLUSIVE | + DDSCL_FULLSCREEN ) ) { TRACE("Called with incompatible flags, returning DDERR_INVALIDPARAMS\n"); LeaveCriticalSection(&ddraw_cs); return DDERR_INVALIDPARAMS; } - else if( (This->cooperative_level & DDSCL_FULLSCREEN) && window) + + if( (This->cooperative_level & DDSCL_FULLSCREEN) && window ) { TRACE("Setting DDSCL_SETFOCUSWINDOW with an already set window, returning DDERR_HWNDALREADYSET\n"); LeaveCriticalSection(&ddraw_cs); @@ -620,6 +622,8 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, DestroyWindow(This->devicewindow); This->devicewindow = NULL; } + + return DD_OK; } /* DDSCL_NORMAL or DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE */ if(cooplevel & DDSCL_NORMAL) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 709ea5d..b6491f3 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -557,6 +557,9 @@ static void testcooperativelevels_normal(void) surfacedesc.dwBackBufferCount = 1; surfacedesc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_COMPLEX | DDSCAPS_FLIP; + rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW); + ok(rc==DDERR_INVALIDPARAMS,"SetCooperativeLevel(DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW) returned: %x\n",rc); + /* Do some tests with DDSCL_NORMAL mode */ /* Fullscreen mode + normal mode + exclusive mode */ rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE | DDSCL_NORMAL); @@ -604,6 +607,10 @@ static void testcooperativelevels_normal(void) if(surface && surface != (IDirectDrawSurface *)0xdeadbeef) IDirectDrawSurface_Release(surface); /* Set the focus window */ + + rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW); + ok(rc==DDERR_INVALIDPARAMS,"SetCooperativeLevel(DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW) returned: %x\n",rc); + rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_SETFOCUSWINDOW);

1 0

Paul Vriens : shdocvw: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: bfe92328504239cd4742092bc61497438a37e703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe92328504239cd4742092bc… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Oct 22 11:01:52 2010 +0200 shdocvw: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/shdocvw/Makefile.in | 1 + dlls/shdocvw/Sr.rc | 156 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 157 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 91c5ae3..e8d2a29 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -37,6 +37,7 @@ RC_SRCS = \ Pl.rc \ Ro.rc \ Si.rc \ + Sr.rc \ Sv.rc \ Uk.rc \ shdocvw.rc diff --git a/dlls/shdocvw/Sr.rc b/dlls/shdocvw/Sr.rc new file mode 100644 index 0000000..5fd9e72 --- /dev/null +++ b/dlls/shdocvw/Sr.rc @@ -0,0 +1,156 @@ +/* + * Copyright 2010 Alexander N. Sørnes <alex(a)thehandofagony.com> + * Copyright 2010 Đorđe Vasiljević + * + * 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" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +IDD_BROWSE_OPEN DIALOG 10, 10, 200, 70 +STYLE DS_MODALFRAME | WS_CAPTION +CAPTION "Отварање адресе" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Унесите адресу коју желите да отворите у Internet Explorer-у",-1,25, 5, 150,15 + LTEXT "Отвори:", -1, 2, 32, 20, 15 + EDITTEXT IDC_BROWSE_OPEN_URL, 25, 30, 160, 13 + DEFPUSHBUTTON "&У реду", IDOK, 25, 50, 50, 15 + PUSHBUTTON "&Откажи", IDCANCEL, 85, 50, 50, 15 +} + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "&Датотека" + { + POPUP "&Ново" + { + MENUITEM "&Прозор" ID_BROWSE_NEW_WINDOW + } + MENUITEM "&Отвори...", ID_BROWSE_OPEN + MENUITEM "&Сачувај", ID_BROWSE_SAVE + MENUITEM "Сачувај &као...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Формат &штампе...", ID_BROWSE_PRINT_FORMAT + MENUITEM "&Штампај...", ID_BROWSE_PRINT + MENUITEM "&Преглед штампе...", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Својства...", ID_BROWSE_PROPERTIES + MENUITEM "&Затвори", ID_BROWSE_QUIT + } + POPUP "&Приказ" + { + POPUP "&Алатнице" + { + MENUITEM "&Стандардна трака" ID_BROWSE_BAR_STD + MENUITEM "&Трака за навигацију" ID_BROWSE_BAR_ADDR + } + } + POPUP "&Омиљено" + { + MENUITEM "&Додај у омиљене..." ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } + POPUP "&Помоћ" + { + MENUITEM "&О Internet Explorer-у...", ID_BROWSE_ABOUT + } +} + +STRINGTABLE +{ + IDS_TB_BACK "Назад" + IDS_TB_FORWARD "Напред" + IDS_TB_STOP "Заустави" + IDS_TB_REFRESH "Освежи" + IDS_TB_HOME "Почетна" + IDS_TB_PRINT "Штампај" +} + +STRINGTABLE +{ + IDS_ADDRESS "Адреса" +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +IDD_BROWSE_OPEN DIALOG 10, 10, 200, 70 +STYLE DS_MODALFRAME | WS_CAPTION +CAPTION "Otvaranje adrese" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Unesite adresu koju želite da otvorite u Internet Explorer-u",-1,25, 5, 150,15 + LTEXT "Otvori:", -1, 2, 32, 20, 15 + EDITTEXT IDC_BROWSE_OPEN_URL, 25, 30, 160, 13 + DEFPUSHBUTTON "&U redu", IDOK, 25, 50, 50, 15 + PUSHBUTTON "&Otkaži", IDCANCEL, 85, 50, 50, 15 +} + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "&Datoteka" + { + POPUP "&Novo" + { + MENUITEM "&Prozor" ID_BROWSE_NEW_WINDOW + } + MENUITEM "&Otvori...", ID_BROWSE_OPEN + MENUITEM "&Sačuvaj", ID_BROWSE_SAVE + MENUITEM "Sačuvaj &kao...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Format &štampe...", ID_BROWSE_PRINT_FORMAT + MENUITEM "&Štampaj...", ID_BROWSE_PRINT + MENUITEM "&Pregled štampe...", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Svojstva...", ID_BROWSE_PROPERTIES + MENUITEM "&Zatvori", ID_BROWSE_QUIT + } + POPUP "&Prikaz" + { + POPUP "&Alatnice" + { + MENUITEM "&Standardna traka" ID_BROWSE_BAR_STD + MENUITEM "&Traka za navigaciju" ID_BROWSE_BAR_ADDR + } + } + POPUP "&Omiljeno" + { + MENUITEM "&Dodaj u omiljene..." ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } + POPUP "&Pomoć" + { + MENUITEM "&O Internet Explorer-u...", ID_BROWSE_ABOUT + } +} + +STRINGTABLE +{ + IDS_TB_BACK "Nazad" + IDS_TB_FORWARD "Napred" + IDS_TB_STOP "Zaustavi" + IDS_TB_REFRESH "Osveži" + IDS_TB_HOME "Početna" + IDS_TB_PRINT "Štampaj" +} + +STRINGTABLE +{ + IDS_ADDRESS "Adresa" +}

1 0

Hans Leidekker : msi: Register the service description in the InstallServices action.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: d7dbb7e08dfc25658d4bdaa0a1cb10a86a23ae50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7dbb7e08dfc25658d4bdaa0a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 22 10:36:20 2010 +0200 msi: Register the service description in the InstallServices action. --- dlls/msi/action.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 80e1418..a9826c9 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5372,6 +5372,7 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) LPCWSTR load_order, serv_name, key; DWORD serv_type, start_type; DWORD err_control; + SERVICE_DESCRIPTIONW sd = {NULL}; static const WCHAR query[] = {'S','E','L','E','C','T',' ','*',' ','F','R', 'O','M',' ', @@ -5403,6 +5404,7 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) serv_name = MSI_RecordGetString(rec, 9); pass = MSI_RecordGetString(rec, 10); comp = MSI_RecordGetString(rec, 12); + deformat_string(package, MSI_RecordGetString(rec, 13), &sd.lpDescription); /* fetch the service path */ row = MSI_QueryGetRecord(package->db, query, comp); @@ -5430,12 +5432,18 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) if (GetLastError() != ERROR_SERVICE_EXISTS) ERR("Failed to create service %s: %d\n", debugstr_w(name), GetLastError()); } + else if (sd.lpDescription) + { + if (!ChangeServiceConfig2W(service, SERVICE_CONFIG_DESCRIPTION, &sd)) + WARN("failed to set service description %u\n", GetLastError()); + } done: CloseServiceHandle(service); CloseServiceHandle(hscm); msi_free(name); msi_free(disp); + msi_free(sd.lpDescription); return ERROR_SUCCESS; }

1 0

Hans Leidekker : msi: The LoadOrderGroup, StartName and Password fields from the ServiceInstall table are formatted strings .
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: 7a460eba711f96ddddd31feb4bdb0fc1f087b42f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a460eba711f96ddddd31feb4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 22 10:36:32 2010 +0200 msi: The LoadOrderGroup, StartName and Password fields from the ServiceInstall table are formatted strings. --- dlls/msi/action.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a9826c9..3b21810 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5367,9 +5367,8 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) MSIRECORD *row; MSIFILE *file; SC_HANDLE hscm, service = NULL; - LPCWSTR comp, depends, pass; - LPWSTR name = NULL, disp = NULL; - LPCWSTR load_order, serv_name, key; + LPCWSTR comp, depends, key; + LPWSTR name = NULL, disp = NULL, load_order = NULL, serv_name = NULL, pass = NULL; DWORD serv_type, start_type; DWORD err_control; SERVICE_DESCRIPTIONW sd = {NULL}; @@ -5400,9 +5399,9 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) deformat_string(package, MSI_RecordGetString(rec, 3), &disp); serv_type = MSI_RecordGetInteger(rec, 4); err_control = MSI_RecordGetInteger(rec, 6); - load_order = MSI_RecordGetString(rec, 7); - serv_name = MSI_RecordGetString(rec, 9); - pass = MSI_RecordGetString(rec, 10); + deformat_string(package, MSI_RecordGetString(rec, 7), &load_order); + deformat_string(package, MSI_RecordGetString(rec, 9), &serv_name); + deformat_string(package, MSI_RecordGetString(rec, 10), &pass); comp = MSI_RecordGetString(rec, 12); deformat_string(package, MSI_RecordGetString(rec, 13), &sd.lpDescription); @@ -5413,7 +5412,6 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) ERR("Control query failed!\n"); goto done; } - key = MSI_RecordGetString(row, 6); file = get_loaded_file(package, key); @@ -5444,6 +5442,9 @@ done: msi_free(name); msi_free(disp); msi_free(sd.lpDescription); + msi_free(load_order); + msi_free(serv_name); + msi_free(pass); return ERROR_SUCCESS; }

1 0

Hans Leidekker : msi: Register service dependencies in the InstallServices action.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: 7f5204e1bc5d64333c9d1d1f7ca81285479596d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f5204e1bc5d64333c9d1d1f7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 22 10:36:45 2010 +0200 msi: Register service dependencies in the InstallServices action. --- dlls/msi/action.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 3b21810..633557d 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5367,8 +5367,9 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) MSIRECORD *row; MSIFILE *file; SC_HANDLE hscm, service = NULL; - LPCWSTR comp, depends, key; - LPWSTR name = NULL, disp = NULL, load_order = NULL, serv_name = NULL, pass = NULL; + LPCWSTR comp, key; + LPWSTR name = NULL, disp = NULL, load_order = NULL, serv_name = NULL; + LPWSTR depends = NULL, pass = NULL; DWORD serv_type, start_type; DWORD err_control; SERVICE_DESCRIPTIONW sd = {NULL}; @@ -5391,15 +5392,12 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) if (start_type == SERVICE_BOOT_START || start_type == SERVICE_SYSTEM_START) goto done; - depends = MSI_RecordGetString(rec, 8); - if (depends && *depends) - FIXME("Dependency list unhandled!\n"); - deformat_string(package, MSI_RecordGetString(rec, 2), &name); deformat_string(package, MSI_RecordGetString(rec, 3), &disp); serv_type = MSI_RecordGetInteger(rec, 4); err_control = MSI_RecordGetInteger(rec, 6); deformat_string(package, MSI_RecordGetString(rec, 7), &load_order); + deformat_string(package, MSI_RecordGetString(rec, 8), &depends); deformat_string(package, MSI_RecordGetString(rec, 9), &serv_name); deformat_string(package, MSI_RecordGetString(rec, 10), &pass); comp = MSI_RecordGetString(rec, 12); @@ -5424,7 +5422,7 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) service = CreateServiceW(hscm, name, disp, GENERIC_ALL, serv_type, start_type, err_control, file->TargetPath, - load_order, NULL, NULL, serv_name, pass); + load_order, NULL, depends, serv_name, pass); if (!service) { if (GetLastError() != ERROR_SERVICE_EXISTS) @@ -5445,6 +5443,7 @@ done: msi_free(load_order); msi_free(serv_name); msi_free(pass); + msi_free(depends); return ERROR_SUCCESS; }

1 0

Paul Vriens : mshtml: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: c125fc15023051512248babd834a878a3865b09d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c125fc15023051512248babd8… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Oct 22 10:23:41 2010 +0200 mshtml: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/Sr.rc | 132 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 403514a..7c25dbb 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -88,6 +88,7 @@ RC_SRCS = \ Ro.rc \ Ru.rc \ Si.rc \ + Sr.rc \ Sv.rc \ Tr.rc \ Uk.rc \ diff --git a/dlls/mshtml/Sr.rc b/dlls/mshtml/Sr.rc new file mode 100644 index 0000000..0db1b71 --- /dev/null +++ b/dlls/mshtml/Sr.rc @@ -0,0 +1,132 @@ +/* + * Copyright 2005-2006 Jacek Caban + * Copyright 2010 Đorđe Vasiljević + * + * 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" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +STRINGTABLE +{ + IDS_STATUS_DONE "Завршено" + IDS_STATUS_DOWNLOADINGFROM "Преузимање из %s..." +} + +STRINGTABLE +{ + IDS_HTMLDISABLED "HTML исцртавање је онемогућено." + IDS_HTMLDOCUMENT "HTML документ" + IDS_DOWNLOADING "Преузимање..." + IDS_INSTALLING "Инсталирање..." +} + +ID_DWL_DIALOG DIALOG 0, 0, 260, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Wine Gecko инсталациони програм" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Wine није успео да пронађе Gecko пакет који је неопходан за исправно функционисање HTML " \ + "програма. Wine је у могућности да аутоматски преузме и инсталира програм.\n\n" \ + "Напомена: препоручујемо Вам да користите расподељене пакете. Погледајте http://wiki.winehq.org/Gecko за више информација.", + ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT + CONTROL "Напредак", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + DEFPUSHBUTTON "&Инсталирај", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Откажи", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP +} + +IDD_HYPERLINK DIALOG 0, 0, 250, 65 +STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Хипервеза" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Подаци о хипервези", -1, 5, 5, 190, 55 + LTEXT "&Врста:", -1, 10, 22, 20, 10 + COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "&Адреса:", -1, 10, 42, 20, 10 + EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "У реду", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Откажи", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP +} + +ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", ID_PROMPT_PROMPT, 10, 10, 180, 30 + EDITTEXT ID_PROMPT_EDIT, 10, 45, 180, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "У реду", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Откажи", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +STRINGTABLE +{ + IDS_STATUS_DONE "Završeno" + IDS_STATUS_DOWNLOADINGFROM "Preuzimanje iz %s..." +} + +STRINGTABLE +{ + IDS_HTMLDISABLED "HTML iscrtavanje je onemogućeno." + IDS_HTMLDOCUMENT "HTML dokument" + IDS_DOWNLOADING "Preuzimanje..." + IDS_INSTALLING "Instaliranje..." +} + +ID_DWL_DIALOG DIALOG 0, 0, 260, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Wine Gecko instalacioni program" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Wine nije uspeo da pronađe Gecko paket koji je neophodan za ispravno funkcionisanje HTML " \ + "programa. Wine je u mogućnosti da automatski preuzme i instalira program.\n\n" \ + "Napomena: preporučujemo Vam da koristite raspodeljene pakete. Pogledajte http://wiki.winehq.org/Gecko za više informacija.", + ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT + CONTROL "Napredak", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + DEFPUSHBUTTON "&Instaliraj", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Otkaži", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP +} + +IDD_HYPERLINK DIALOG 0, 0, 250, 65 +STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Hiperveza" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Podaci o hipervezi", -1, 5, 5, 190, 55 + LTEXT "&Vrsta:", -1, 10, 22, 20, 10 + COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "&Adresa:", -1, 10, 42, 20, 10 + EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "U redu", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Otkaži", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP +} + +ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", ID_PROMPT_PROMPT, 10, 10, 180, 30 + EDITTEXT ID_PROMPT_EDIT, 10, 45, 180, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "U redu", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Otkaži", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP +}

1 0

Hans Leidekker : services: Save service dependencies.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: eae2cf56cbba5179c0041ec26fc00f854ef1d5da URL: http://source.winehq.org/git/wine.git/?a=commit;h=eae2cf56cbba5179c0041ec26… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 22 10:35:37 2010 +0200 services: Save service dependencies. --- programs/services/services.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 59fe8bc..1ecf30b 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -154,6 +154,25 @@ static DWORD reg_set_string_value(HKEY hKey, LPCWSTR value_name, LPCWSTR string) return RegSetValueExW(hKey, value_name, 0, REG_SZ, (const BYTE*)string, sizeof(WCHAR)*(strlenW(string) + 1)); } +static DWORD reg_set_multisz_value(HKEY hKey, LPCWSTR value_name, LPCWSTR string) +{ + const WCHAR *ptr; + + if (!string) + { + DWORD err; + err = RegDeleteValueW(hKey, value_name); + if (err != ERROR_FILE_NOT_FOUND) + return err; + + return ERROR_SUCCESS; + } + + ptr = string; + while (*ptr) ptr += strlenW(ptr) + 1; + return RegSetValueExW(hKey, value_name, 0, REG_MULTI_SZ, (const BYTE*)string, sizeof(WCHAR)*(ptr - string + 1)); +} + DWORD save_service_config(struct service_entry *entry) { DWORD err; @@ -173,6 +192,10 @@ DWORD save_service_config(struct service_entry *entry) goto cleanup; if ((err = reg_set_string_value(hKey, SZ_DESCRIPTION, entry->description)) != 0) goto cleanup; + if ((err = reg_set_multisz_value(hKey, SZ_DEPEND_ON_SERVICE, entry->dependOnServices)) != 0) + goto cleanup; + if ((err = reg_set_multisz_value(hKey, SZ_DEPEND_ON_GROUP, entry->dependOnGroups)) != 0) + goto cleanup; if ((err = RegSetValueExW(hKey, SZ_START, 0, REG_DWORD, (LPBYTE)&entry->config.dwStartType, sizeof(DWORD))) != 0) goto cleanup; if ((err = RegSetValueExW(hKey, SZ_ERROR, 0, REG_DWORD, (LPBYTE)&entry->config.dwErrorControl, sizeof(DWORD))) != 0)

1 0

Hans Leidekker : services: Support setting and changing service dependencies.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: e01455d41d72a9823fbe6c33f821bdf037c955d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e01455d41d72a9823fbe6c33f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 22 10:35:49 2010 +0200 services: Support setting and changing service dependencies. --- programs/services/rpc.c | 104 +++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 96 insertions(+), 8 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index c647cc8..41630be 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -84,8 +84,11 @@ struct sc_lock struct scmdatabase *db; }; -static void free_config_strings(QUERY_SERVICE_CONFIGW *old_cfg, QUERY_SERVICE_CONFIGW *new_cfg) +static void free_service_strings(struct service_entry *old, struct service_entry *new) { + QUERY_SERVICE_CONFIGW *old_cfg = &old->config; + QUERY_SERVICE_CONFIGW *new_cfg = &new->config; + if (old_cfg->lpBinaryPathName != new_cfg->lpBinaryPathName) HeapFree(GetProcessHeap(), 0, old_cfg->lpBinaryPathName); @@ -97,6 +100,12 @@ static void free_config_strings(QUERY_SERVICE_CONFIGW *old_cfg, QUERY_SERVICE_CO if (old_cfg->lpDisplayName != new_cfg->lpDisplayName) HeapFree(GetProcessHeap(), 0, old_cfg->lpDisplayName); + + if (old->dependOnServices != new->dependOnServices) + HeapFree(GetProcessHeap(), 0, old->dependOnServices); + + if (old->dependOnGroups != new->dependOnGroups) + HeapFree(GetProcessHeap(), 0, old->dependOnGroups); } /* Check if the given handle is of the required type and allows the requested access. */ @@ -335,6 +344,78 @@ DWORD svcctl_OpenServiceW( return create_handle_for_service(entry, dwDesiredAccess, phService); } +static DWORD parse_dependencies(const WCHAR *dependencies, struct service_entry *entry) +{ + WCHAR *services = NULL, *groups, *s; + DWORD len, len_services = 0, len_groups = 0; + const WCHAR *ptr = dependencies; + + if (!dependencies || !dependencies[0]) + { + entry->dependOnServices = NULL; + entry->dependOnGroups = NULL; + return ERROR_SUCCESS; + } + + while (*ptr) + { + len = strlenW(ptr) + 1; + if (ptr[0] == '+' && ptr[1]) + len_groups += len - 1; + else + len_services += len; + ptr += len; + } + if (!len_services) entry->dependOnServices = NULL; + else + { + services = HeapAlloc(GetProcessHeap(), 0, (len_services + 1) * sizeof(WCHAR)); + if (!services) + return ERROR_OUTOFMEMORY; + + s = services; + ptr = dependencies; + while (*ptr) + { + len = strlenW(ptr) + 1; + if (*ptr != '+') + { + strcpyW(s, ptr); + s += len; + } + ptr += len; + } + *s = 0; + entry->dependOnServices = services; + } + if (!len_groups) entry->dependOnGroups = NULL; + else + { + groups = HeapAlloc(GetProcessHeap(), 0, (len_groups + 1) * sizeof(WCHAR)); + if (!groups) + { + HeapFree(GetProcessHeap(), 0, services); + return ERROR_OUTOFMEMORY; + } + s = groups; + ptr = dependencies; + while (*ptr) + { + len = strlenW(ptr) + 1; + if (ptr[0] == '+' && ptr[1]) + { + strcpyW(s, ptr + 1); + s += len - 1; + } + ptr += len; + } + *s = 0; + entry->dependOnGroups = groups; + } + + return ERROR_SUCCESS; +} + DWORD svcctl_CreateServiceW( SC_RPC_HANDLE hSCManager, LPCWSTR lpServiceName, @@ -369,12 +450,15 @@ DWORD svcctl_CreateServiceW( if (lpPassword) WINE_FIXME("Don't know how to add a password\n"); /* I always get ERROR_GEN_FAILURE */ - if (lpDependencies) - WINE_FIXME("Dependencies not supported yet\n"); err = service_create(lpServiceName, &entry); if (err != ERROR_SUCCESS) return err; + + err = parse_dependencies((LPCWSTR)lpDependencies, entry); + if (err != ERROR_SUCCESS) + return err; + entry->ref_count = 1; entry->config.dwServiceType = entry->status.dwServiceType = dwServiceType; entry->config.dwStartType = dwStartType; @@ -540,9 +624,6 @@ DWORD svcctl_ChangeServiceConfigW( if (lpdwTagId != NULL) WINE_FIXME("Changing tag id not supported\n"); - if (lpDependencies != NULL) - WINE_FIXME("Changing dependencies not supported\n"); - if (lpServiceStartName != NULL) new_entry.config.lpServiceStartName = (LPWSTR)lpServiceStartName; @@ -552,6 +633,13 @@ DWORD svcctl_ChangeServiceConfigW( if (lpDisplayName != NULL) new_entry.config.lpDisplayName = (LPWSTR)lpDisplayName; + err = parse_dependencies((LPCWSTR)lpDependencies, &new_entry); + if (err != ERROR_SUCCESS) + { + service_unlock(service->service_entry); + return err; + } + if (!validate_service_config(&new_entry)) { WINE_ERR("The configuration after the change wouldn't be valid\n"); @@ -576,10 +664,10 @@ DWORD svcctl_ChangeServiceConfigW( err = save_service_config(&new_entry); if (ERROR_SUCCESS == err) { - free_config_strings(&service->service_entry->config,&new_entry.config); + free_service_strings(service->service_entry, &new_entry); *service->service_entry = new_entry; } - else free_config_strings(&new_entry.config,&service->service_entry->config); + else free_service_strings(&new_entry, service->service_entry); service_unlock(service->service_entry); return err;

1 0

Hans Leidekker : msi: Don' t inline msi_feature_set_state and msi_component_set_state.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: ded22a58c0f6b47a2e9de10d6d414182e7153ffc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ded22a58c0f6b47a2e9de10d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 22 10:35:59 2010 +0200 msi: Don't inline msi_feature_set_state and msi_component_set_state. --- dlls/msi/action.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/msipriv.h | 98 +-------------------------------------------------- 2 files changed, 94 insertions(+), 96 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index c47e68a..80e1418 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -169,6 +169,98 @@ static const WCHAR szWriteEnvironmentStrings[] = * helper functions ********************************************************/ +void msi_feature_set_state( MSIPACKAGE *package, MSIFEATURE *feature, INSTALLSTATE state ) +{ + if (!package->ProductCode) + { + feature->ActionRequest = state; + feature->Action = state; + } + else if (state == INSTALLSTATE_ABSENT) + { + switch (feature->Installed) + { + case INSTALLSTATE_ABSENT: + feature->ActionRequest = INSTALLSTATE_UNKNOWN; + feature->Action = INSTALLSTATE_UNKNOWN; + break; + default: + feature->ActionRequest = state; + feature->Action = state; + } + } + else if (state == INSTALLSTATE_SOURCE) + { + switch (feature->Installed) + { + case INSTALLSTATE_ABSENT: + case INSTALLSTATE_SOURCE: + feature->ActionRequest = state; + feature->Action = state; + break; + case INSTALLSTATE_LOCAL: + feature->ActionRequest = INSTALLSTATE_LOCAL; + feature->Action = INSTALLSTATE_LOCAL; + break; + default: + feature->ActionRequest = INSTALLSTATE_UNKNOWN; + feature->Action = INSTALLSTATE_UNKNOWN; + } + } + else + { + feature->ActionRequest = state; + feature->Action = state; + } + if (feature->Attributes & msidbFeatureAttributesUIDisallowAbsent) + { + feature->Action = INSTALLSTATE_UNKNOWN; + } +} + +void msi_component_set_state( MSIPACKAGE *package, MSICOMPONENT *comp, INSTALLSTATE state ) +{ + if (!package->ProductCode) + { + comp->ActionRequest = state; + comp->Action = state; + } + else if (state == INSTALLSTATE_ABSENT) + { + switch (comp->Installed) + { + case INSTALLSTATE_LOCAL: + case INSTALLSTATE_SOURCE: + case INSTALLSTATE_DEFAULT: + comp->ActionRequest = state; + comp->Action = state; + break; + default: + comp->ActionRequest = INSTALLSTATE_UNKNOWN; + comp->Action = INSTALLSTATE_UNKNOWN; + } + } + else if (state == INSTALLSTATE_SOURCE) + { + if (comp->Installed == INSTALLSTATE_ABSENT || + (comp->Installed == INSTALLSTATE_SOURCE && comp->hasLocalFeature)) + { + comp->ActionRequest = state; + comp->Action = state; + } + else + { + comp->ActionRequest = INSTALLSTATE_UNKNOWN; + comp->Action = INSTALLSTATE_UNKNOWN; + } + } + else + { + comp->ActionRequest = state; + comp->Action = state; + } +} + static void ui_actionstart(MSIPACKAGE *package, LPCWSTR action) { static const WCHAR Query_t[] = diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 6f0b551..30910de 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -888,102 +888,6 @@ extern UINT ACTION_PerformUIAction(MSIPACKAGE *package, const WCHAR *action, UIN extern void ACTION_FinishCustomActions( const MSIPACKAGE* package); extern UINT ACTION_CustomAction(MSIPACKAGE *package,const WCHAR *action, UINT script, BOOL execute); -static inline void msi_feature_set_state(MSIPACKAGE *package, - MSIFEATURE *feature, - INSTALLSTATE state) -{ - if (!package->ProductCode) - { - feature->ActionRequest = state; - feature->Action = state; - } - else if (state == INSTALLSTATE_ABSENT) - { - switch (feature->Installed) - { - case INSTALLSTATE_ABSENT: - feature->ActionRequest = INSTALLSTATE_UNKNOWN; - feature->Action = INSTALLSTATE_UNKNOWN; - break; - default: - feature->ActionRequest = state; - feature->Action = state; - } - } - else if (state == INSTALLSTATE_SOURCE) - { - switch (feature->Installed) - { - case INSTALLSTATE_ABSENT: - case INSTALLSTATE_SOURCE: - feature->ActionRequest = state; - feature->Action = state; - break; - case INSTALLSTATE_LOCAL: - feature->ActionRequest = INSTALLSTATE_LOCAL; - feature->Action = INSTALLSTATE_LOCAL; - break; - default: - feature->ActionRequest = INSTALLSTATE_UNKNOWN; - feature->Action = INSTALLSTATE_UNKNOWN; - } - } - else - { - feature->ActionRequest = state; - feature->Action = state; - } - if (feature->Attributes & msidbFeatureAttributesUIDisallowAbsent) - { - feature->Action = INSTALLSTATE_UNKNOWN; - } -} - -static inline void msi_component_set_state(MSIPACKAGE *package, - MSICOMPONENT *comp, - INSTALLSTATE state) -{ - if (!package->ProductCode) - { - comp->ActionRequest = state; - comp->Action = state; - } - else if (state == INSTALLSTATE_ABSENT) - { - switch (comp->Installed) - { - case INSTALLSTATE_LOCAL: - case INSTALLSTATE_SOURCE: - case INSTALLSTATE_DEFAULT: - comp->ActionRequest = state; - comp->Action = state; - break; - default: - comp->ActionRequest = INSTALLSTATE_UNKNOWN; - comp->Action = INSTALLSTATE_UNKNOWN; - } - } - else if (state == INSTALLSTATE_SOURCE) - { - if (comp->Installed == INSTALLSTATE_ABSENT || - (comp->Installed == INSTALLSTATE_SOURCE && comp->hasLocalFeature)) - { - comp->ActionRequest = state; - comp->Action = state; - } - else - { - comp->ActionRequest = INSTALLSTATE_UNKNOWN; - comp->Action = INSTALLSTATE_UNKNOWN; - } - } - else - { - comp->ActionRequest = state; - comp->Action = state; - } -} - /* actions in other modules */ extern UINT ACTION_AppSearch(MSIPACKAGE *package); extern UINT ACTION_CCPSearch(MSIPACKAGE *package); @@ -1035,6 +939,8 @@ extern UINT msi_set_last_used_source(LPCWSTR product, LPCWSTR usersid, MSIINSTALLCONTEXT context, DWORD options, LPCWSTR value); extern UINT msi_get_local_package_name(LPWSTR path, LPCWSTR suffix); extern UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace); +extern void msi_component_set_state(MSIPACKAGE *, MSICOMPONENT *, INSTALLSTATE); +extern void msi_feature_set_state(MSIPACKAGE *, MSIFEATURE *, INSTALLSTATE); /* media */

1 0