March 2008 - Wine-Commits - list.winehq.org

James Hawkins : msi: Implement the StopServices action.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: fb508ff8fa06495c58867ee4a0f5345c52d33191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb508ff8fa06495c58867ee4a… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Mar 24 01:31:07 2008 -0500 msi: Implement the StopServices action. --- dlls/msi/action.c | 131 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 124 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 8e753bf..1be4598 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4678,6 +4678,130 @@ static UINT ACTION_StartServices( MSIPACKAGE *package ) return rc; } +static BOOL stop_service_dependents(SC_HANDLE scm, SC_HANDLE service) +{ + DWORD i, needed, count; + ENUM_SERVICE_STATUSW *dependencies; + SERVICE_STATUS ss; + SC_HANDLE depserv; + + if (EnumDependentServicesW(service, SERVICE_ACTIVE, NULL, + 0, &needed, &count)) + return TRUE; + + if (GetLastError() != ERROR_MORE_DATA) + return FALSE; + + dependencies = msi_alloc(needed); + if (!dependencies) + return FALSE; + + if (!EnumDependentServicesW(service, SERVICE_ACTIVE, dependencies, + needed, &needed, &count)) + goto error; + + for (i = 0; i < count; i++) + { + depserv = OpenServiceW(scm, dependencies[i].lpServiceName, + SERVICE_STOP | SERVICE_QUERY_STATUS); + if (!depserv) + goto error; + + if (!ControlService(depserv, SERVICE_CONTROL_STOP, &ss)) + goto error; + } + + return TRUE; + +error: + msi_free(dependencies); + return FALSE; +} + +static UINT ITERATE_StopService(MSIRECORD *rec, LPVOID param) +{ + MSIPACKAGE *package = (MSIPACKAGE *)param; + MSICOMPONENT *comp; + SERVICE_STATUS status; + SERVICE_STATUS_PROCESS ssp; + SC_HANDLE scm = NULL, service = NULL; + LPWSTR name, args; + DWORD event, needed; + + event = MSI_RecordGetInteger(rec, 3); + if (!(event & msidbServiceControlEventStop)) + return ERROR_SUCCESS; + + comp = get_loaded_component(package, MSI_RecordGetString(rec, 6)); + if (!comp || comp->Action == INSTALLSTATE_UNKNOWN || comp->Action == INSTALLSTATE_ABSENT) + return ERROR_SUCCESS; + + deformat_string(package, MSI_RecordGetString(rec, 2), &name); + deformat_string(package, MSI_RecordGetString(rec, 4), &args); + args = strdupW(MSI_RecordGetString(rec, 4)); + + scm = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS); + if (!scm) + { + WARN("Failed to open the SCM: %d\n", GetLastError()); + goto done; + } + + service = OpenServiceW(scm, name, + SERVICE_STOP | + SERVICE_QUERY_STATUS | + SERVICE_ENUMERATE_DEPENDENTS); + if (!service) + { + WARN("Failed to open service (%s): %d\n", + debugstr_w(name), GetLastError()); + goto done; + } + + if (!QueryServiceStatusEx(service, SC_STATUS_PROCESS_INFO, (LPBYTE)&ssp, + sizeof(SERVICE_STATUS_PROCESS), &needed)) + { + WARN("Failed to query service status (%s): %d\n", + debugstr_w(name), GetLastError()); + goto done; + } + + if (ssp.dwCurrentState == SERVICE_STOPPED) + goto done; + + stop_service_dependents(scm, service); + + if (!ControlService(service, SERVICE_STOP, &status)) + WARN("Failed to stop service (%s): %d\n", debugstr_w(name), GetLastError()); + +done: + CloseServiceHandle(service); + CloseServiceHandle(scm); + msi_free(name); + msi_free(args); + + return ERROR_SUCCESS; +} + +static UINT ACTION_StopServices( MSIPACKAGE *package ) +{ + UINT rc; + MSIQUERY *view; + + static const WCHAR query[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + 'S','e','r','v','i','c','e','C','o','n','t','r','o','l',0 }; + + rc = MSI_DatabaseOpenViewW(package->db, query, &view); + if (rc != ERROR_SUCCESS) + return ERROR_SUCCESS; + + rc = MSI_IterateRecords(view, NULL, ITERATE_StopService, package); + msiobj_release(&view->hdr); + + return rc; +} + static MSIFILE *msi_find_file( MSIPACKAGE *package, LPCWSTR filename ) { MSIFILE *file; @@ -5510,13 +5634,6 @@ static UINT ACTION_SelfUnregModules( MSIPACKAGE *package ) return msi_unimplemented_action_stub( package, "SelfUnregModules", table ); } -static UINT ACTION_StopServices( MSIPACKAGE *package ) -{ - static const WCHAR table[] = { - 'S','e','r','v','i','c','e','C','o','n','t','r','o','l',0 }; - return msi_unimplemented_action_stub( package, "StopServices", table ); -} - static UINT ACTION_DeleteServices( MSIPACKAGE *package ) { static const WCHAR table[] = {

1 0

Roderick Colenbrander : wgl: Return TRUE on wglReleasePbufferDCARB success.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: ccb4ee39ab9fed61a17d927fed79bfebbd645f66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccb4ee39ab9fed61a17d927fe… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Mar 22 12:36:20 2008 +0000 wgl: Return TRUE on wglReleasePbufferDCARB success. --- dlls/winex11.drv/opengl.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 33b09d3..a61a116 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2528,8 +2528,7 @@ static GLboolean WINAPI X11DRV_wglQueryPbufferARB(HPBUFFERARB hPbuffer, int iAtt static int WINAPI X11DRV_wglReleasePbufferDCARB(HPBUFFERARB hPbuffer, HDC hdc) { TRACE("(%p, %p)\n", hPbuffer, hdc); - DeleteDC(hdc); - return 0; + return DeleteDC(hdc); } /**

1 0

James Hawkins : msi: Don't hardcode the root drive.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: fdd55977bc44a0a477fc5ec224f55f5678f50591 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdd55977bc44a0a477fc5ec22… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Mar 23 18:10:02 2008 -0700 msi: Don't hardcode the root drive. --- dlls/msi/tests/format.c | 46 ++++++++++++++++++++++++++++++---------------- 1 files changed, 30 insertions(+), 16 deletions(-) diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index aec347d..f4c1670 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -21,6 +21,7 @@ #include <stdio.h> #include <windows.h> +#include <shlwapi.h> #include <msi.h> #include <msiquery.h> @@ -2176,6 +2177,7 @@ static void test_formatrecord_tables(void) CHAR buf[MAX_PATH]; CHAR curr_dir[MAX_PATH]; CHAR expected[MAX_PATH]; + CHAR root[MAX_PATH]; DWORD size; UINT r; @@ -2304,48 +2306,57 @@ static void test_formatrecord_tables(void) r = MsiDoAction(hpkg, "CostFinalize"); ok( r == ERROR_SUCCESS, "CostFinalize failed: %d\n", r); + size = MAX_PATH; + MsiGetProperty( hpkg, "ROOTDRIVE", root, &size ); + + sprintf( expected, "1: %sfrontal.txt ", root); + /* frontal full file key */ size = MAX_PATH; MsiRecordSetString( hrec, 1, "[#frontal_file]" ); r = MsiFormatRecord( hpkg, hrec, buf, &size ); ok( r == ERROR_SUCCESS, "format record failed: %d\n", r); - ok( !lstrcmp( buf, "1: C:\\frontal.txt " ), "Expected '1: C:\\frontal.txt ', got %s\n", buf); + ok( !lstrcmp( buf, expected ), "Expected \"%s\", got \"%s\"\n", expected, buf); /* frontal short file key */ size = MAX_PATH; MsiRecordSetString( hrec, 1, "[!frontal_file]" ); r = MsiFormatRecord( hpkg, hrec, buf, &size ); ok( r == ERROR_SUCCESS, "format record failed: %d\n", r); - ok( !lstrcmp( buf, "1: C:\\frontal.txt " ), "Expected '1: C:\\frontal.txt ', got %s\n", buf); + ok( !lstrcmp( buf, expected ), "Expected \"%s\", got \"%s\"\n", expected, buf); + + sprintf( expected, "1: %sI am a really long directory\\temporal.txt ", root); /* temporal full file key */ size = MAX_PATH; MsiRecordSetString( hrec, 1, "[#temporal_file]" ); r = MsiFormatRecord( hpkg, hrec, buf, &size ); ok( r == ERROR_SUCCESS, "format record failed: %d\n", r); - ok( !lstrcmp( buf, "1: C:\\I am a really long directory\\temporal.txt " ), - "Expected '1: C:\\I am a really long directory\\temporal.txt ', got %s\n", buf); + ok( !lstrcmp( buf, expected ), "Expected \"%s\", got \"%s\"\n", expected, buf); /* temporal short file key */ size = MAX_PATH; MsiRecordSetString( hrec, 1, "[!temporal_file]" ); r = MsiFormatRecord( hpkg, hrec, buf, &size ); ok( r == ERROR_SUCCESS, "format record failed: %d\n", r); - ok( !lstrcmp( buf, "1: C:\\I am a really long directory\\temporal.txt " ), - "Expected '1: C:\\I am a really long directory\\temporal.txt ', got %s\n", buf); + ok( !lstrcmp( buf, expected ), "Expected \"%s\", got \"%s\"\n", expected, buf); /* custom action 51, files don't exist */ r = MsiDoAction( hpkg, "MyCustom" ); ok( r == ERROR_SUCCESS, "MyCustom failed: %d\n", r); + sprintf( expected, "%sI am a really long directory\\temporal.txt", root); + size = MAX_PATH; r = MsiGetProperty( hpkg, "prop", buf, &size ); ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); - ok( !lstrcmp( buf, "C:\\I am a really long directory\\temporal.txt" ), - "Expected 'C:\\I am a really long directory\\temporal.txt', got %s\n", buf); + ok( !lstrcmp( buf, expected ), "Expected \"%s\", got \"%s\"\n", expected, buf); + + sprintf( buf, "%sI am a really long directory", root ); + CreateDirectory( buf, NULL ); - CreateDirectory( "C:\\I am a really long directory", NULL ); - create_test_file( "C:\\I am a really long directory\\temporal.txt" ); + lstrcat( buf, "\\temporal.txt" ); + create_test_file( buf ); /* custom action 51, files exist */ r = MsiDoAction( hpkg, "MyCustom" ); @@ -2356,8 +2367,7 @@ static void test_formatrecord_tables(void) ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); todo_wine { - ok( !lstrcmp( buf, "C:\\I am a really long directory\\temporal.txt" ), - "Expected 'C:\\I am a really long directory\\temporal.txt', got %s\n", buf); + ok( !lstrcmp( buf, expected ), "Expected \"%s\", got \"%s\"\n", expected, buf); } /* custom action 51, escaped text 1 */ @@ -2387,13 +2397,14 @@ static void test_formatrecord_tables(void) ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); ok( !lstrcmp( buf, "" ), "Expected '', got %s\n", buf); + sprintf( expected, "1: %sI am a really long directory\\ ", root); + /* component with INSTALLSTATE_LOCAL */ size = MAX_PATH; MsiRecordSetString( hrec, 1, "[$temporal]" ); r = MsiFormatRecord( hpkg, hrec, buf, &size ); ok( r == ERROR_SUCCESS, "format record failed: %d\n", r); - ok( !lstrcmp( buf, "1: C:\\I am a really long directory\\ " ), - "Expected '1: C:\\I am a really long directory\\ ', got %s\n", buf); + ok( !lstrcmp( buf, expected ), "Expected \"%s\", got \"%s\"\n", expected, buf); r = MsiSetComponentState( hpkg, "temporal", INSTALLSTATE_SOURCE ); ok( r == ERROR_SUCCESS, "failed to set install state: %d\n", r); @@ -2408,8 +2419,11 @@ static void test_formatrecord_tables(void) ok( r == ERROR_SUCCESS, "format record failed: %d\n", r); ok( !lstrcmp( buf, expected ), "Expected '%s', got %s\n", expected, buf); - DeleteFile( "C:\\I am a really long directory\\temporal.txt" ); - RemoveDirectory( "C:\\I am a really long directory" ); + sprintf( buf, "%sI am a really long directory\\temporal.txt", root ); + DeleteFile( buf ); + + sprintf( buf, "%sI am a really long directory", root ); + RemoveDirectory( buf ); MsiCloseHandle( hrec ); MsiCloseHandle( hpkg );

1 0

James Hawkins : msi: INSTALLPROPERTY_AUTHORIZED_LUA_APP is only available with msi >= 3.0.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: 9048ecef83c8dbef301da28a0ad8a5ed2d61d061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9048ecef83c8dbef301da28a0… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Mar 23 17:52:27 2008 -0700 msi: INSTALLPROPERTY_AUTHORIZED_LUA_APP is only available with msi >= 3.0. --- dlls/msi/tests/msi.c | 36 ++++++++++++++++++++++++------------ 1 files changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 62219fd..bb45d8d 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -3206,9 +3206,12 @@ static void test_MsiGetProductInfo(void) sz = MAX_PATH; lstrcpyA(buf, "apple"); r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_AUTHORIZED_LUA_APP, buf, &sz); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); - ok(sz == 0, "Expected 0, got %d\n", sz); + if (r != ERROR_UNKNOWN_PROPERTY) + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); + ok(sz == 0, "Expected 0, got %d\n", sz); + } res = RegSetValueExA(propkey, "AuthorizedLUAApp", 0, REG_DWORD, (const BYTE *)&val, sizeof(DWORD)); @@ -3218,9 +3221,12 @@ static void test_MsiGetProductInfo(void) sz = MAX_PATH; lstrcpyA(buf, "apple"); r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_AUTHORIZED_LUA_APP, buf, &sz); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); - ok(sz == 0, "Expected 0, got %d\n", sz); + if (r != ERROR_UNKNOWN_PROPERTY) + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); + ok(sz == 0, "Expected 0, got %d\n", sz); + } res = RegSetValueExA(prodkey, "AuthorizedLUAApp", 0, REG_SZ, (LPBYTE)"auth", 5); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -3229,9 +3235,12 @@ static void test_MsiGetProductInfo(void) sz = MAX_PATH; lstrcpyA(buf, "apple"); r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_AUTHORIZED_LUA_APP, buf, &sz); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(buf, "auth"), "Expected \"auth\", got \"%s\"\n", buf); - ok(sz == 4, "Expected 4, got %d\n", sz); + if (r != ERROR_UNKNOWN_PROPERTY) + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, "auth"), "Expected \"auth\", got \"%s\"\n", buf); + ok(sz == 4, "Expected 4, got %d\n", sz); + } res = RegSetValueExA(prodkey, "AuthorizedLUAApp", 0, REG_DWORD, (const BYTE *)&val, sizeof(DWORD)); @@ -3241,9 +3250,12 @@ static void test_MsiGetProductInfo(void) sz = MAX_PATH; lstrcpyA(buf, "apple"); r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_AUTHORIZED_LUA_APP, buf, &sz); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf); - ok(sz == 2, "Expected 2, got %d\n", sz); + if (r != ERROR_UNKNOWN_PROPERTY) + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf); + ok(sz == 2, "Expected 2, got %d\n", sz); + } RegDeleteValueA(propkey, "HelpLink"); RegDeleteValueA(propkey, "DisplayName");

1 0

James Hawkins : msi: Initialize the size parameter.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: d69342cd67ee753e52e864e4847198fcbc14e468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d69342cd67ee753e52e864e48… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Mar 23 17:45:19 2008 -0700 msi: Initialize the size parameter. --- dlls/msi/tests/source.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index b109315..aef15ba 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -272,6 +272,7 @@ static void test_MsiSourceListGetInfo(void) ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* size is non-NULL while value is NULL */ + size = MAX_PATH; r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAME, NULL, &size); ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); @@ -283,6 +284,7 @@ static void test_MsiSourceListGetInfo(void) ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); /* user product key exists */ + size = MAX_PATH; r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAME, NULL, &size); ok(r == ERROR_BAD_CONFIGURATION, "Expected ERROR_BAD_CONFIGURATION, got %d\n", r);

1 0

Michael Stefaniuc : comctl32: Add the Romanian translation.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: c038ade2a722769a4fda32465a5366360b27f14c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c038ade2a722769a4fda32465… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Mar 23 22:05:07 2008 +0100 comctl32: Add the Romanian translation. --- dlls/comctl32/comctl_Ro.rc | 92 ++++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/rsrc.rc | 1 + 2 files changed, 93 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/comctl_Ro.rc b/dlls/comctl32/comctl_Ro.rc new file mode 100644 index 0000000..0581d0d --- /dev/null +++ b/dlls/comctl32/comctl_Ro.rc @@ -0,0 +1,92 @@ +/* + * Copyright 1999 Eric Kohl + * Copyright 2008 Michael Stefaniuc + * + * 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 + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Proprietăți pentru %s" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&Renunță", IDCANCEL,58,122,50,14 + PUSHBUTTON "A&plică", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "&Ajutor", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Expert" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< &Înapoi", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&Următor >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "&Termină", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "&Renunță", IDCANCEL,178,138,50,14 + PUSHBUTTON "&Ajutor", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Personalizare toolbar" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Închide", IDCANCEL,308,6,44,14 + PUSHBUTTON "&Resetează", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Ajutor", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "Mută în &sus", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "Mută în &jos", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "&Butoane disponibile:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "A&daugă ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- &Șterge", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "Butoane &toolbar:", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "Închide" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "Azi:" + IDM_GOTODAY "Mergi la Azi" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "Separator" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "Nimic" +} + +#pragma code_page(default) diff --git a/dlls/comctl32/rsrc.rc b/dlls/comctl32/rsrc.rc index 06ffd4d..9028df9 100644 --- a/dlls/comctl32/rsrc.rc +++ b/dlls/comctl32/rsrc.rc @@ -107,6 +107,7 @@ IDI_TT_ERROR_SM ICON LOADONCALL DISCARDABLE idi_tt_error_sm.ico #include "comctl_No.rc" #include "comctl_Pl.rc" #include "comctl_Pt.rc" +#include "comctl_Ro.rc" #include "comctl_Ru.rc" #include "comctl_Si.rc" #include "comctl_Sv.rc"

1 0

Michael Stefaniuc : shlwapi: Add the Romanian translation.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: 20c91aba948df9148c2f78be42ea3fd1fa31000a URL: http://source.winehq.org/git/wine.git/?a=commit;h=20c91aba948df9148c2f78be4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Mar 23 22:05:25 2008 +0100 shlwapi: Add the Romanian translation. --- dlls/shlwapi/shlwapi.rc | 1 + dlls/shlwapi/shlwapi_Ro.rc | 46 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/shlwapi.rc b/dlls/shlwapi/shlwapi.rc index 2564c29..3018685 100644 --- a/dlls/shlwapi/shlwapi.rc +++ b/dlls/shlwapi/shlwapi.rc @@ -39,5 +39,6 @@ #include "shlwapi_No.rc" #include "shlwapi_Pl.rc" #include "shlwapi_Pt.rc" +#include "shlwapi_Ro.rc" #include "shlwapi_Sv.rc" #include "shlwapi_Tr.rc" diff --git a/dlls/shlwapi/shlwapi_Ro.rc b/dlls/shlwapi/shlwapi_Ro.rc new file mode 100644 index 0000000..9b6278f --- /dev/null +++ b/dlls/shlwapi/shlwapi_Ro.rc @@ -0,0 +1,46 @@ +/* + * Copyright 2004 Jon Griffiths + * Copyright 2008 Michael Stefaniuc + * + * 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 + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Eroare!" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 + LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 + CHECKBOX "Nu &afișa din nou acest mesaj", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Renunță" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Da" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Nu" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ + IDS_BYTES_FORMAT "%ld octeți" + IDS_TIME_INTERVAL_HOURS " ore" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sec" +} + +#pragma code_page(default)

1 0

Michael Stefaniuc : browseui: Add the German translation.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: 1c56df3ab27f57464dde960ef3c3cfc0336e1538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c56df3ab27f57464dde960ef… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Mar 23 22:04:50 2008 +0100 browseui: Add the German translation. --- dlls/browseui/rsrc.rc | 1 + dlls/browseui/rsrc_De.rc | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/browseui/rsrc.rc b/dlls/browseui/rsrc.rc index 9933eb8..4c4254a 100644 --- a/dlls/browseui/rsrc.rc +++ b/dlls/browseui/rsrc.rc @@ -24,6 +24,7 @@ #include "version.rc" +#include "rsrc_De.rc" #include "rsrc_En.rc" #include "rsrc_Es.rc" #include "rsrc_Fr.rc" diff --git a/dlls/browseui/rsrc_De.rc b/dlls/browseui/rsrc_De.rc new file mode 100644 index 0000000..c5c237f --- /dev/null +++ b/dlls/browseui/rsrc_De.rc @@ -0,0 +1,39 @@ +/* + * Copyright 2007 Mikolaj Zalewski + * Copyright 2008 Michael Stefaniuc + * + * 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 + */ + + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_CANCELLING "Abbrechen..." +} + +IDD_PROGRESS_DLG DIALOG 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 + PUSHBUTTON "&Abbrechen", IDCANCEL, 205, 65, 45, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX +}

1 0

Jacek Caban : mshtml: Abstract BSCallback implementation.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: c8bb048b1a82d78b263542d5d217cb7e067a8758 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8bb048b1a82d78b263542d5d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 23 02:17:17 2008 +0100 mshtml: Abstract BSCallback implementation. --- dlls/mshtml/mshtml_private.h | 4 +- dlls/mshtml/navigate.c | 428 ++++++++++++++++++++++++------------------ dlls/mshtml/task.c | 4 +- 3 files changed, 251 insertions(+), 185 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8bb048b1a82d78b26354…

1 0

Michael Stefaniuc : credui: Update the German translation.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: aa754a70f04d6127fa2aa6bdc1510f2970ce70bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa754a70f04d6127fa2aa6bdc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Mar 23 22:02:55 2008 +0100 credui: Update the German translation. --- dlls/credui/credui_De.rc | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/credui/credui_De.rc b/dlls/credui/credui_De.rc index 3c9fcd2..7214d04 100644 --- a/dlls/credui/credui_De.rc +++ b/dlls/credui/credui_De.rc @@ -31,10 +31,20 @@ BEGIN LTEXT "&Benutzername:",IDC_STATIC,8,62,72,12,SS_CENTERIMAGE CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 - LTEXT "&Passwort:",IDC_STATIC,8,80,72,12,SS_CENTERIMAGE + LTEXT "&Kennwort:",IDC_STATIC,8,80,72,12,SS_CENTERIMAGE EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "&Remember my password",IDC_SAVE,"Button", + CONTROL "Kennwort &merken",IDC_SAVE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 DEFPUSHBUTTON "OK",IDOK,97,128,50,14 PUSHBUTTON "Abbrechen",IDCANCEL,156,128,50,14 END + +STRINGTABLE DISCARDABLE +{ + IDS_TITLEFORMAT "Mit %s verbinden" + IDS_MESSAGEFORMAT "Verbindung mit %s wird hergestellt" + IDS_INCORRECTPASSWORDTITLE "Anmeldung fehlgeschlagen" + IDS_INCORRECTPASSWORD "Bitte �berpr�fen Sie Ihren Benutzernamen\nund geben Sie das Kennwort neu ein." + IDS_CAPSLOCKONTITLE "Die Feststelltaste ist aktiviert" + IDS_CAPSLOCKON "Mit aktivierter Feststelltaste k�nnte das Kennwort falsch eingeben werden.\n\nVor der Eingabe des Kennworts sollten Sie die Feststelltaste deaktivieren." +}

1 0