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

Eric Pouech : winedbg: Fix the way array derefs are done.
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: fac749634521e085353fee7fe285fdbeffe1b6d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fac749634521e085353fee7fe… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 29 17:21:55 2009 +0200 winedbg: Fix the way array derefs are done. --- programs/winedbg/types.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index ef5469f..8d3dabc 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -310,26 +310,26 @@ BOOL types_array_index(const struct dbg_lvalue* lvalue, int index, DWORD64 length; if (!types_get_real_type(&type, &tag)) return FALSE; + /* Contents of array share same data (addr mode, module...) */ + *result = *lvalue; switch (tag) { case SymTagArrayType: types_get_info(&type, TI_GET_COUNT, &count); if (index < 0 || index >= count) return FALSE; - /* fall through */ + break; case SymTagPointerType: - /* Contents of array share same data (addr mode, module...) */ - *result = *lvalue; - /* - * Get the base type, so we know how much to index by. - */ - types_get_info(&type, TI_GET_TYPE, &result->type.id); - types_get_info(&result->type, TI_GET_LENGTH, &length); memory_read_value(lvalue, sizeof(result->addr.Offset), &result->addr.Offset); - result->addr.Offset += index * (DWORD)length; break; default: assert(FALSE); } + /* + * Get the base type, so we know how much to index by. + */ + types_get_info(&type, TI_GET_TYPE, &result->type.id); + types_get_info(&result->type, TI_GET_LENGTH, &length); + result->addr.Offset += index * (DWORD)length; return TRUE; }

1 0

Aurimas Fischer : appwiz.cpl: Add Lithuanian translation.
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: adcca63f79aa7f1917041e068a25033aaa6b0383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adcca63f79aa7f1917041e068… Author: Aurimas Fischer <aurimas(a)gmail.com> Date: Sat Mar 28 16:36:36 2009 +0200 appwiz.cpl: Add Lithuanian translation. --- dlls/appwiz.cpl/Lt.rc | 82 +++++++++++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/appwiz.rc | 1 + 2 files changed, 83 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Lt.rc b/dlls/appwiz.cpl/Lt.rc new file mode 100644 index 0000000..6f524ac --- /dev/null +++ b/dlls/appwiz.cpl/Lt.rc @@ -0,0 +1,82 @@ +/* +* Add/Remove Programs Lithuanian resources +* +* Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> +* +* 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 +* +*/ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_CPL_TITLE, "Pridėti/pašalinti programas" + IDS_CPL_DESC, "Leidžia įdiegti naują programinę įrangą, ar pašalinti jau įdiegtą iš jūsų kompiuterio." + IDS_TAB1_TITLE, "Programos" + + IDS_UNINSTALL_FAILED, "Nepavyko įvykdyti programos pašalinimo komandos '%s'. Ar norite pašalinti programos šalinimo įrašą iš registro?" + IDS_NOT_SPECIFIED, "Nenurodyta" + + IDS_COLUMN_NAME, "Vardas" + IDS_COLUMN_PUBLISHER, "Leidėjas" + IDS_COLUMN_VERSION, "Versija" +} + +IDD_MAIN DIALOG 0, 0, 320, 220 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Įdiegti/Pašalinti" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Norėdami įdiegti naują programą iš diskelio, kompaktinio disko ar standžiojo disko spauskite 'Įdiegti'.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "Į&diegti...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 + CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 + CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 + CONTROL "Ši programinė įranga gali būti automatiškai pašalinta. Norėdami pašalinti programą ar modifikuoti jos įdiegtus komponentus pažymėkite ją sąraše ir spauskite 'Įdiegti/Pašalinti'.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 + CONTROL "Įdiegti/Pa&šalinti...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 198, 64, 14 + CONTROL "&Priežiūros informacija...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 156, 198, 84, 14 + CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 +} + +IDD_INFO DIALOG 0, 0, 256, 138 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Priežiūros informacija" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Gerai", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 + CONTROL "Ši informacija gali būti panaudota programos '%s' techninei priežiūrai gauti:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "Leidėjas:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 + CONTROL "Versija:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 + CONTROL "Kontaktas:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 + CONTROL "Priežiūros informacija:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 72, 8 + CONTROL "Priežiūros telefonas:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 + CONTROL "Skaityk:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 + CONTROL "Produkto atnaujinimai:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 72, 8 + CONTROL "Komentarai:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 + CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8 + CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8 + CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8 + CONTROL "", IDC_INFO_SUPPORT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 60, 136, 8 + CONTROL "", IDC_INFO_PHONE, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 70, 136, 8 + CONTROL "", IDC_INFO_README, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 80, 136, 8 + CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 + CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 +} + +#pragma code_page(default) diff --git a/dlls/appwiz.cpl/appwiz.rc b/dlls/appwiz.cpl/appwiz.rc index 843662a..7764463 100644 --- a/dlls/appwiz.cpl/appwiz.rc +++ b/dlls/appwiz.cpl/appwiz.rc @@ -29,6 +29,7 @@ #include "Fr.rc" #include "Ja.rc" #include "Ko.rc" +#include "Lt.rc" #include "Nl.rc" #include "No.rc" #include "Pt.rc"

1 0

Aurimas Fischer : browseui: Add Lithuanian translation.
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: e76719e25b14f4d82d6d6007754821e5eb6e111f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e76719e25b14f4d82d6d60077… Author: Aurimas Fischer <aurimas(a)gmail.com> Date: Sat Mar 28 14:11:44 2009 +0200 browseui: Add Lithuanian translation. --- dlls/browseui/rsrc.rc | 1 + dlls/browseui/rsrc_Lt.rc | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/browseui/rsrc.rc b/dlls/browseui/rsrc.rc index 8ad4672..c16391f 100644 --- a/dlls/browseui/rsrc.rc +++ b/dlls/browseui/rsrc.rc @@ -29,6 +29,7 @@ #include "rsrc_Es.rc" #include "rsrc_Fr.rc" #include "rsrc_Ko.rc" +#include "rsrc_Lt.rc" #include "rsrc_Nl.rc" #include "rsrc_No.rc" #include "rsrc_Pl.rc" diff --git a/dlls/browseui/rsrc_Lt.rc b/dlls/browseui/rsrc_Lt.rc new file mode 100644 index 0000000..8814534 --- /dev/null +++ b/dlls/browseui/rsrc_Lt.rc @@ -0,0 +1,42 @@ +/* + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * 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 + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_CANCELLING "Atsisakoma..." +} + +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 "&Atsisakyti", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX +} + +#pragma code_page(default)

1 0

Aurimas Fischer : devenum: Add Lithuanian translation.
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: 2af10186b6603eebf166791c3515a9381de2c545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2af10186b6603eebf166791c3… Author: Aurimas Fischer <aurimas(a)gmail.com> Date: Sun Mar 29 17:39:50 2009 +0300 devenum: Add Lithuanian translation. --- dlls/devenum/devenum.rc | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc index c5ad0fc..b9ff4a5 100644 --- a/dlls/devenum/devenum.rc +++ b/dlls/devenum/devenum.rc @@ -161,3 +161,12 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT 9 "기본 웨이브 출력 장치" 10 "기본 미디출력 장치" } + +STRINGTABLE DISCARDABLE +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL +{ + 7 "Numatytasis DirectSound" + 8 "DirectSound: %s" + 9 "Numatytasis WaveOut įrenginys" + 10 "Numatytasis MidiOut įrenginys" +}

1 0

Rob Shearman : include: Add declarations for RpcMgmtInqStats and RpcMgmtStatsVectorFree.
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: c82efc02eee000c4cd5b293d0d8a930df257084d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c82efc02eee000c4cd5b293d0… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Mar 29 18:39:32 2009 +0100 include: Add declarations for RpcMgmtInqStats and RpcMgmtStatsVectorFree. --- include/rpcdce.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/rpcdce.h b/include/rpcdce.h index aec99a4..f7bb44c 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -394,6 +394,9 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RpcMgmtWaitServerListen( void ); RPCRTAPI RPC_STATUS RPC_ENTRY + RpcMgmtInqStats( RPC_BINDING_HANDLE Binding, RPC_STATS_VECTOR **Statistics ); + +RPCRTAPI RPC_STATUS RPC_ENTRY RpcMgmtStopServerListening( RPC_BINDING_HANDLE Binding ); RPCRTAPI RPC_STATUS RPC_ENTRY @@ -413,6 +416,9 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RpcMgmtSetServerStackSize( ULONG ThreadStackSize ); RPCRTAPI RPC_STATUS RPC_ENTRY +RpcMgmtStatsVectorFree( RPC_STATS_VECTOR **StatsVector ); + +RPCRTAPI RPC_STATUS RPC_ENTRY RpcServerRegisterIf( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv ); RPCRTAPI RPC_STATUS RPC_ENTRY

1 0

Paul Vriens : kernel32/tests: Fix some test failures on Win9x and WinME.
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: a61e117781659b075506e2a42fca63ccbdb4b0e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a61e117781659b075506e2a42… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Mar 30 10:43:50 2009 +0200 kernel32/tests: Fix some test failures on Win9x and WinME. --- dlls/kernel32/tests/profile.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index ab7c7fa..5120ec7 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -802,6 +802,8 @@ static void test_GetPrivateProfileString(const char *content, const char *descri DeleteFileA(filename); } +static DWORD timeout = 0; + static BOOL check_file_data(LPCSTR path, LPCSTR data) { HANDLE file; @@ -809,6 +811,10 @@ static BOOL check_file_data(LPCSTR path, LPCSTR data) DWORD size; BOOL ret; + /* Sleep() is needed on Win9x and WinME */ + if (timeout) + Sleep(timeout); + file = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); if (file == INVALID_HANDLE_VALUE) return FALSE; @@ -847,6 +853,8 @@ static void test_WritePrivateProfileString(void) broken(GetLastError() == ERROR_INVALID_PARAMETER) || /* NT4 */ broken(GetLastError() == 0xdeadbeef), /* Win9x and WinME */ "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + if (GetLastError() == 0xdeadbeef) + timeout = 1000; ok(GetFileAttributesA(path) == INVALID_FILE_ATTRIBUTES, "Expected path to not exist\n"); @@ -905,7 +913,9 @@ static void test_WritePrivateProfileString(void) ok(ret == TRUE, "Expected TRUE, got %d\n", ret); todo_wine { - ok(check_file_data(path, data), "File doesn't match\n"); + ok(check_file_data(path, data) || + (broken(GetFileAttributesA(path) == INVALID_FILE_ATTRIBUTES)), /* Win9x and WinME */ + "File doesn't match\n"); } DeleteFileA(path); @@ -913,15 +923,20 @@ static void test_WritePrivateProfileString(void) data = "[App]\r\n" "key=\r\n"; ret = WritePrivateProfileStringA("App", "key", "", path); - ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - ok(check_file_data(path, data), "File doesn't match\n"); + ok(ret == TRUE || + broken(!ret), /* Win9x and WinME */ + "Expected TRUE, got %d\n", ret); + ok(check_file_data(path, data) || + (broken(GetFileAttributesA(path) == INVALID_FILE_ATTRIBUTES)), /* Win9x and WinME */ + "File doesn't match\n"); DeleteFileA(path); /* empty lpFileName */ SetLastError(0xdeadbeef); ret = WritePrivateProfileStringA("App", "key", "string", ""); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); - ok(GetLastError() == ERROR_ACCESS_DENIED, + ok(GetLastError() == ERROR_ACCESS_DENIED || + broken(GetLastError() == ERROR_PATH_NOT_FOUND), /* Win9x and WinME */ "Expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); /* The resulting file will be X:\\%WINDIR%\\win1.tmp */

1 0

Detlef Riekenberg : dinput/tests: Remove duplicate version dump.
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: 5599912e2735a0e0aaf97165acc4c6a78548cf5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5599912e2735a0e0aaf97165a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Mar 27 22:45:59 2009 +0100 dinput/tests: Remove duplicate version dump. We have the version already in the header of the winetest results. --- dlls/dinput/tests/dinput_test.h | 19 ------------------- dlls/dinput/tests/joystick.c | 3 --- dlls/dinput/tests/keyboard.c | 37 ------------------------------------- dlls/dinput/tests/mouse.c | 3 --- 4 files changed, 0 insertions(+), 62 deletions(-) diff --git a/dlls/dinput/tests/dinput_test.h b/dlls/dinput/tests/dinput_test.h deleted file mode 100644 index 9a9af6c..0000000 --- a/dlls/dinput/tests/dinput_test.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2005 Robert Reif - * - * 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 - */ - -extern const char * get_file_version(const char * file_name); diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index 944dbb1..aad8049 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -29,7 +29,6 @@ #include "windef.h" #include "wingdi.h" #include "dinput.h" -#include "dinput_test.h" #define numObjects(x) (sizeof(x) / sizeof(x[0])) @@ -635,8 +634,6 @@ START_TEST(joystick) { CoInitialize(NULL); - trace("DLL Version: %s\n", get_file_version("dinput.dll")); - joystick_tests(0x0700); joystick_tests(0x0500); joystick_tests(0x0300); diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index de55d32..2d4a12f 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -29,41 +29,6 @@ #include "windef.h" #include "wingdi.h" #include "dinput.h" -#include "dinput_test.h" - -const char * get_file_version(const char * file_name) -{ - static char version[32]; - static char backslash[] = "\\"; - DWORD size; - DWORD handle; - - size = GetFileVersionInfoSizeA(file_name, &handle); - if (size) { - char * data = HeapAlloc(GetProcessHeap(), 0, size); - if (data) { - if (GetFileVersionInfoA(file_name, handle, size, data)) { - VS_FIXEDFILEINFO *pFixedVersionInfo; - UINT len; - if (VerQueryValueA(data, backslash, (LPVOID *)&pFixedVersionInfo, &len)) { - sprintf(version, "%d.%d.%d.%d", - pFixedVersionInfo->dwFileVersionMS >> 16, - pFixedVersionInfo->dwFileVersionMS & 0xffff, - pFixedVersionInfo->dwFileVersionLS >> 16, - pFixedVersionInfo->dwFileVersionLS & 0xffff); - } else - sprintf(version, "not available"); - } else - sprintf(version, "failed"); - - HeapFree(GetProcessHeap(), 0, data); - } else - sprintf(version, "failed"); - } else - sprintf(version, "not available"); - - return version; -} static void acquire_tests(LPDIRECTINPUT pDI, HWND hwnd) { @@ -201,8 +166,6 @@ START_TEST(keyboard) { CoInitialize(NULL); - trace("DLL Version: %s\n", get_file_version("dinput.dll")); - keyboard_tests(0x0700); CoUninitialize(); diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index 42e5982..520a867 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -29,7 +29,6 @@ #include "windef.h" #include "wingdi.h" #include "dinput.h" -#include "dinput_test.h" static const HRESULT SetCoop_null_window[16] = { E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, @@ -145,8 +144,6 @@ START_TEST(mouse) { CoInitialize(NULL); - trace("DLL Version: %s\n", get_file_version("dinput.dll")); - mouse_tests(); CoUninitialize();

1 0

Aurimas Fischer : credui: Add Lithuanian translation.
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: 4e7b9b4f7bbe0f3003732228983ed48168546fd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e7b9b4f7bbe0f30037322289… Author: Aurimas Fischer <aurimas(a)gmail.com> Date: Sat Mar 28 14:02:36 2009 +0200 credui: Add Lithuanian translation. --- dlls/credui/credui.rc | 1 + dlls/credui/credui_Lt.rc | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/credui/credui.rc b/dlls/credui/credui.rc index 41f332c..d144fd2 100644 --- a/dlls/credui/credui.rc +++ b/dlls/credui/credui.rc @@ -33,6 +33,7 @@ IDB_BANNER BITMAP LOADONCALL DISCARDABLE banner.bmp #include "credui_Es.rc" #include "credui_Fr.rc" #include "credui_Ko.rc" +#include "credui_Lt.rc" #include "credui_Nl.rc" #include "credui_No.rc" #include "credui_Pl.rc" diff --git a/dlls/credui/credui_Lt.rc b/dlls/credui/credui_Lt.rc new file mode 100644 index 0000000..9ad3e4b --- /dev/null +++ b/dlls/credui/credui_Lt.rc @@ -0,0 +1,55 @@ +/* + * Lithuanian language resource file for Credentials UI + * + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * 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 + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "&Naudotojo vardas:",-1,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "&Slaptažodis:",-1,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "Į&siminti mano slaptažodį",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "Gerai",IDOK,97,128,50,14 + PUSHBUTTON "Atsisakyti",IDCANCEL,156,128,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_TITLEFORMAT "Užmegzti ryšį su %s" + IDS_MESSAGEFORMAT "Jungiamasi prie %s" + IDS_INCORRECTPASSWORDTITLE "Prisijungimas nesėkmingas" + IDS_INCORRECTPASSWORD "Įsitikinkite, kad naudotojo vardas\nir slaptažodis yra teisingi." + IDS_CAPSLOCKONTITLE "Didžiųjų raidžių būsena įjungta" + IDS_CAPSLOCKON "Kai įjungta didžiųjų raidžių būsena, savo slaptažodį galite įvesti neteisingai.\n\nPaspauskite didžiųjų raidžių klaviatūros klavišą didžiųjų raidžių būsenai išjungti\nprieš rinkdami savo slaptažodį." +} + +#pragma code_page(default)

1 0

Aric Stewart : msctf: Add a file version.
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: f02e4dcf272e8602979d9301f293b905e4bc0fec URL: http://source.winehq.org/git/wine.git/?a=commit;h=f02e4dcf272e8602979d9301f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 27 12:22:03 2009 -0500 msctf: Add a file version. Checked by the IE8 install. --- dlls/msctf/Makefile.in | 3 +++ dlls/msctf/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/Makefile.in b/dlls/msctf/Makefile.in index 5502bd6..4387913 100644 --- a/dlls/msctf/Makefile.in +++ b/dlls/msctf/Makefile.in @@ -14,6 +14,9 @@ C_SRCS = \ regsvr.c \ threadmgr.c +RC_SRCS = \ + version.rc + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/msctf/version.rc b/dlls/msctf/version.rc new file mode 100644 index 0000000..8bd8ff3 --- /dev/null +++ b/dlls/msctf/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2009 CodeWeavers, Aric Stewart + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Msctf" +#define WINE_FILENAME_STR "msctf.dll" +#define WINE_FILEVERSION 5,1,2600,3319 +#define WINE_FILEVERSION_STR " 5.1.2600.3319" +#define WINE_PRODUCTVERSION 5,1,2600,3319 +#define WINE_PRODUCTVERSION_STR "5.1.2600.3319" + +#include "wine/wine_common_ver.rc"

1 0

Detlef Riekenberg : dsound/tests: Remove duplicate version dump.
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: 8819156b493408c97c53fc62f7634e6abffab9ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=8819156b493408c97c53fc62f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Mar 27 22:37:27 2009 +0100 dsound/tests: Remove duplicate version dump. We have the version already in the header of the winetest results. --- dlls/dsound/tests/capture.c | 1 - dlls/dsound/tests/ds3d.c | 1 - dlls/dsound/tests/ds3d8.c | 1 - dlls/dsound/tests/dsound.c | 1 - dlls/dsound/tests/dsound8.c | 34 ---------------------------------- dlls/dsound/tests/dsound_test.h | 1 - dlls/dsound/tests/duplex.c | 1 - dlls/dsound/tests/propset.c | 1 - 8 files changed, 0 insertions(+), 41 deletions(-) diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index b2a377a..87a5a59 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -687,7 +687,6 @@ START_TEST(capture) hDsound = LoadLibrary("dsound.dll"); if (hDsound) { - trace("DLL Version: %s\n", get_file_version("dsound.dll")); pDirectSoundCaptureCreate=(void*)GetProcAddress(hDsound, "DirectSoundCaptureCreate"); diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index db662c0..8f5b88a 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1280,7 +1280,6 @@ START_TEST(ds3d) hDsound = LoadLibrary("dsound.dll"); if (hDsound) { - trace("DLL Version: %s\n", get_file_version("dsound.dll")); pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound, "DirectSoundEnumerateA"); diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index ba9f2d2..1f5f28a 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -1133,7 +1133,6 @@ START_TEST(ds3d8) hDsound = LoadLibrary("dsound.dll"); if (hDsound) { - trace("DLL Version: %s\n", get_file_version("dsound.dll")); pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound, "DirectSoundEnumerateA"); diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 10a3fa8..114dbb6 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1083,7 +1083,6 @@ START_TEST(dsound) hDsound = LoadLibrary("dsound.dll"); if (hDsound) { - trace("DLL Version: %s\n", get_file_version("dsound.dll")); pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound, "DirectSoundEnumerateA"); diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 2e02a92..c79a7ac 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -874,39 +874,6 @@ static void dsound8_tests(void) ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08x\n",rc); } -const char * get_file_version(const char * file_name) -{ - static char version[32]; - static char backslash[] = "\\"; - DWORD size; - DWORD handle; - - size = GetFileVersionInfoSizeA("dsound.dll", &handle); - if (size) { - char * data = HeapAlloc(GetProcessHeap(), 0, size); - if (data) { - if (GetFileVersionInfoA("dsound.dll", handle, size, data)) { - VS_FIXEDFILEINFO *pFixedVersionInfo; - UINT len; - if (VerQueryValueA(data, backslash, (LPVOID *)&pFixedVersionInfo, &len)) { - sprintf(version, "%d.%d.%d.%d", - pFixedVersionInfo->dwFileVersionMS >> 16, - pFixedVersionInfo->dwFileVersionMS & 0xffff, - pFixedVersionInfo->dwFileVersionLS >> 16, - pFixedVersionInfo->dwFileVersionLS & 0xffff); - } else - sprintf(version, "not available"); - } else - sprintf(version, "failed"); - - HeapFree(GetProcessHeap(), 0, data); - } else - sprintf(version, "failed"); - } else - sprintf(version, "not available"); - - return version; -} START_TEST(dsound8) { @@ -917,7 +884,6 @@ START_TEST(dsound8) hDsound = LoadLibrary("dsound.dll"); if (hDsound) { - trace("DLL Version: %s\n", get_file_version("dsound.dll")); pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound, "DirectSoundEnumerateA"); diff --git a/dlls/dsound/tests/dsound_test.h b/dlls/dsound/tests/dsound_test.h index 23ca169..b09c98b 100644 --- a/dlls/dsound/tests/dsound_test.h +++ b/dlls/dsound/tests/dsound_test.h @@ -85,5 +85,4 @@ extern void test_buffer8(LPDIRECTSOUND8,LPDIRECTSOUNDBUFFER*, LPDIRECTSOUND3DLISTENER,BOOL,BOOL); extern const char * getDSBCAPS(DWORD xmask); extern int align(int length, int align); -extern const char * get_file_version(const char * file_name); extern const char * format_string(const WAVEFORMATEX* wfx); diff --git a/dlls/dsound/tests/duplex.c b/dlls/dsound/tests/duplex.c index ae816a4..11fb2a7 100644 --- a/dlls/dsound/tests/duplex.c +++ b/dlls/dsound/tests/duplex.c @@ -231,7 +231,6 @@ START_TEST(duplex) hDsound = LoadLibrary("dsound.dll"); if (hDsound) { - trace("DLL Version: %s\n", get_file_version("dsound.dll")); pDirectSoundFullDuplexCreate=(void*)GetProcAddress(hDsound, "DirectSoundFullDuplexCreate"); diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c index fba6e06..70a8e0d 100644 --- a/dlls/dsound/tests/propset.c +++ b/dlls/dsound/tests/propset.c @@ -720,7 +720,6 @@ START_TEST(propset) hDsound = LoadLibrary("dsound.dll"); if (hDsound) { - trace("DLL Version: %s\n", get_file_version("dsound.dll")); pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound, "DirectSoundEnumerateA");

1 0