March 2006 - wine-commits

Mike McCormack : avifil32: Use HeapAlloc instead of GlobalAlloc. Eliminate windowsx.h.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: 417067bb0d0323af5100e45cba05afedbeffc28a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=417067bb0d0323af5100e45… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Mar 18 10:17:33 2006 +0900 avifil32: Use HeapAlloc instead of GlobalAlloc. Eliminate windowsx.h. --- dlls/avifil32/avifile.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index c6f4827..b89a454 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -40,7 +40,6 @@ #include "winuser.h" #include "winnls.h" #include "winerror.h" -#include "windowsx.h" #include "mmsystem.h" #include "vfw.h" @@ -1341,7 +1340,7 @@ static HRESULT WINAPI IAVIStream_fnWrite return AVIERR_UNSUPPORTED; } - This->lpHandlerData = GlobalAllocPtr(GMEM_MOVEABLE, size); + This->lpHandlerData = HeapAlloc(GetProcessHeap(), 0, size); if (This->lpHandlerData == NULL) return AVIERR_MEMORY; This->cbHandlerData = size; @@ -1576,7 +1575,7 @@ static void AVIFILE_DestructAVIStream This->cbBuffer = 0; } if (This->lpHandlerData != NULL) { - GlobalFreePtr(This->lpHandlerData); + HeapFree(GetProcessHeap(), 0, This->lpHandlerData); This->lpHandlerData = NULL; This->cbHandlerData = 0; } @@ -1687,8 +1686,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFile case ckidSTREAMHANDLERDATA: if (pStream->lpHandlerData != NULL) return AVIERR_BADFORMAT; - pStream->lpHandlerData = GlobalAllocPtr(GMEM_DDESHARE|GMEM_MOVEABLE, - ck.cksize); + pStream->lpHandlerData = HeapAlloc(GetProcessHeap(), 0, ck.cksize); if (pStream->lpHandlerData == NULL) return AVIERR_MEMORY; pStream->cbHandlerData = ck.cksize; @@ -1702,8 +1700,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFile if (ck.cksize == 0) break; - pStream->lpFormat = GlobalAllocPtr(GMEM_DDESHARE|GMEM_MOVEABLE, - ck.cksize); + pStream->lpFormat = HeapAlloc(GetProcessHeap(), 0, ck.cksize); if (pStream->lpFormat == NULL) return AVIERR_MEMORY; pStream->cbFormat = ck.cksize;

1 0

Mike McCormack : taskmgr: Fix some gcc 4.1 warnings.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: ca4f8dd83c0a6f5c93687997f5245e087bd51777 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ca4f8dd83c0a6f5c9368799… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 17 22:49:49 2006 +0900 taskmgr: Fix some gcc 4.1 warnings. --- programs/taskmgr/dbgchnl.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/taskmgr/dbgchnl.c b/programs/taskmgr/dbgchnl.c index a80aedf..4b8f362 100644 --- a/programs/taskmgr/dbgchnl.c +++ b/programs/taskmgr/dbgchnl.c @@ -92,7 +92,7 @@ static DWORD get_selected_pid(void) lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + SendMessage(hProcessPageListCtrl, LVM_GETITEM, 0, (LPARAM) &lvitem); if (lvitem.state & LVIS_SELECTED) break; @@ -209,7 +209,7 @@ static void DebugChannels_FillList(HWND { HANDLE hProcess; - ListView_DeleteAllItems(hChannelLV); + SendMessage(hChannelLV, LVM_DELETEALLITEMS, 0, 0); hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_OPERATION | PROCESS_VM_READ, FALSE, get_selected_pid()); if (!hProcess) return; /* FIXME messagebox */ @@ -228,31 +228,31 @@ static void DebugChannels_OnCreate(HWND lvc.fmt = LVCFMT_LEFT; lvc.pszText = _T("Debug Channel"); lvc.cx = 100; - ListView_InsertColumn(hLV, 0, &lvc); + SendMessage(hLV, LVM_INSERTCOLUMN, 0, (LPARAM) &lvc); lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_CENTER; lvc.pszText = _T("Fixme"); lvc.cx = 55; - ListView_InsertColumn(hLV, 1, &lvc); + SendMessage(hLV, LVM_INSERTCOLUMN, 1, (LPARAM) &lvc); lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_CENTER; lvc.pszText = _T("Err"); lvc.cx = 55; - ListView_InsertColumn(hLV, 2, &lvc); + SendMessage(hLV, LVM_INSERTCOLUMN, 2, (LPARAM) &lvc); lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_CENTER; lvc.pszText = _T("Warn"); lvc.cx = 55; - ListView_InsertColumn(hLV, 3, &lvc); + SendMessage(hLV, LVM_INSERTCOLUMN, 3, (LPARAM) &lvc); lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_CENTER; lvc.pszText = _T("Trace"); lvc.cx = 55; - ListView_InsertColumn(hLV, 4, &lvc); + SendMessage(hLV, LVM_INSERTCOLUMN, 4, (LPARAM) &lvc); DebugChannels_FillList(hLV); }

1 0

Mike McCormack : winecfg: Fix some gcc 4.1 warnings.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: a3b7a0729f6a94f343ee598febf6aea429c99633 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a3b7a0729f6a94f343ee598… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 17 22:49:27 2006 +0900 winecfg: Fix some gcc 4.1 warnings. --- programs/winecfg/appdefaults.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 681d21c..78874a0 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -130,7 +130,7 @@ static void add_listview_item(HWND listv item.lParam = (LPARAM) association; item.iItem = ListView_GetItemCount(listview); - ListView_InsertItem(listview, &item); + SendMessage(listview, LVM_INSERTITEM, 0, (LPARAM) &item); } /* Called when the application is initialized (cannot reinit!) */ @@ -179,7 +179,7 @@ static void init_appsheet(HWND dialog) item.state = LVIS_SELECTED | LVIS_FOCUSED; item.stateMask = LVIS_SELECTED | LVIS_FOCUSED; - ListView_SetItem(listview, &item); + SendMessage(listview, LVM_SETITEM, 0, (LPARAM) &item); } } @@ -214,7 +214,7 @@ static void on_selection_change(HWND dia if (item.iItem == -1) return; - ListView_GetItem(listview, &item); + SendMessage(listview, LVM_GETITEM, 0, (LPARAM) &item); current_app = (char *) item.lParam; @@ -301,7 +301,7 @@ static void on_remove_app_click(HWND dia section[strlen(section)] = '\0'; /* remove last backslash */ set_reg_key(config_key, section, NULL, NULL); /* delete the section */ - ListView_DeleteItem(listview, selection); + SendMessage(listview, LVM_DELETEITEM, selection, 0); ListView_SetItemState(listview, selection - 1, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED); SetFocus(listview);

1 0

Mike McCormack : crypt32: Fix a warning.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: 32f6b71c769b443f648f498e7061b8591fc7917a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=32f6b71c769b443f648f498… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 17 22:48:56 2006 +0900 crypt32: Fix a warning. --- dlls/crypt32/tests/store.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 68356f7..bc52ebf 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -267,7 +267,7 @@ static void testGetSubjectCert(void) store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); - ok(store, "CertOpenStore failed: %ld\n", GetLastError()); + ok(store != NULL, "CertOpenStore failed: %ld\n", GetLastError()); if (store != NULL) { PCCERT_CONTEXT context1, context2;

1 0

YunSong Hwang : msvfw32: Update Korean resources.
by Alexandre Julliard 17 Mar '06

17 Mar '06

Module: wine Branch: refs/heads/master Commit: b07299f185be6091b44d8a0004e9526f4f738a66 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b07299f185be6091b44d8a0… Author: YunSong Hwang <hys545(a)dreamwiz.com> Date: Fri Mar 17 18:33:30 2006 +0900 msvfw32: Update Korean resources. --- dlls/msvfw32/msvfw32_Ko.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvfw32/msvfw32_Ko.rc b/dlls/msvfw32/msvfw32_Ko.rc index 4ed2c24..ebb3a33 100644 --- a/dlls/msvfw32/msvfw32_Ko.rc +++ b/dlls/msvfw32/msvfw32_Ko.rc @@ -1,6 +1,6 @@ /* * Copyright 2005 Dmitry Timoshkov - * Copyright 2005 YunSong Hwang + * Copyright 2005,2006 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,13 +21,13 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Video Compression" +CAPTION "�� " FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "Ȯ��",IDOK,129,2,49,14 PUSHBUTTON "��",IDCANCEL,129,18,49,14 - LTEXT "��(&Co):",-1,9,6,105,8 + LTEXT "��(&C):",-1,9,6,105,8 COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP PUSHBUTTON "��(&f)...",882,129,36,49,14

1 0

Mike McCormack : taskmgr: Fix some gcc 4.1 warnings.
by Alexandre Julliard 17 Mar '06

17 Mar '06

Module: wine Branch: refs/heads/master Commit: 2d8459575e688a934126532c210b35990f1f87b7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2d8459575e688a934126532… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 17 18:38:55 2006 +0900 taskmgr: Fix some gcc 4.1 warnings. --- programs/taskmgr/taskmgr.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index c784d04..6c56a8c 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -504,17 +504,17 @@ BOOL OnCreate(HWND hWnd) memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = szTemp; - TabCtrl_InsertItem(hTabWnd, 0, &item); + SendMessage(hTabWnd, TCM_INSERTITEM, 0, (LPARAM)&item); _tcscpy(szTemp, _T("Processes")); memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = szTemp; - TabCtrl_InsertItem(hTabWnd, 1, &item); + SendMessage(hTabWnd, TCM_INSERTITEM, 1, (LPARAM)&item); _tcscpy(szTemp, _T("Performance")); memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = szTemp; - TabCtrl_InsertItem(hTabWnd, 2, &item); + SendMessage(hTabWnd, TCM_INSERTITEM, 2, (LPARAM)&item); /* Size everything correctly */ GetClientRect(hWnd, &rc);

1 0

Mike McCormack : taskmgr: Fix some gcc 4.1 warnings.
by Alexandre Julliard 17 Mar '06

17 Mar '06

Module: wine Branch: refs/heads/master Commit: 489d61348a0feca34820dd6279cf3ef748033b8a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=489d61348a0feca34820dd6… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 17 18:37:41 2006 +0900 taskmgr: Fix some gcc 4.1 warnings. --- programs/taskmgr/procpage.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/taskmgr/procpage.c b/programs/taskmgr/procpage.c index 6f7e9cb..667e747 100644 --- a/programs/taskmgr/procpage.c +++ b/programs/taskmgr/procpage.c @@ -85,7 +85,7 @@ ProcessPageWndProc(HWND hDlg, UINT messa */ SendMessage(hProcessPageListCtrl, WM_SETFONT, SendMessage(hProcessPage, WM_GETFONT, 0, 0), TRUE); SetWindowText(hProcessPageListCtrl, _T("Processes")); - ListView_SetExtendedListViewStyle(hProcessPageListCtrl, ListView_GetExtendedListViewStyle(hProcessPageListCtrl) | LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP); + SendMessage(hProcessPageListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, ListView_GetExtendedListViewStyle(hProcessPageListCtrl) | LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP); AddColumns(); @@ -348,7 +348,7 @@ void ProcessPageOnNotify(WPARAM wParam, lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + SendMessage(hProcessPageListCtrl, LVM_GETITEM, 0, (LPARAM) &lvitem); if (lvitem.state & LVIS_SELECTED) break;

1 0

Mike McCormack : taskmgr: Fix some gcc 4.1 warnings.
by Alexandre Julliard 17 Mar '06

17 Mar '06

Module: wine Branch: refs/heads/master Commit: 2f5293fd3cf78759d906df691da23f0d35a02c4d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2f5293fd3cf78759d906df6… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 17 18:37:23 2006 +0900 taskmgr: Fix some gcc 4.1 warnings. --- programs/taskmgr/proclist.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/programs/taskmgr/proclist.c b/programs/taskmgr/proclist.c index c21cdca..7552ab1 100644 --- a/programs/taskmgr/proclist.c +++ b/programs/taskmgr/proclist.c @@ -82,10 +82,14 @@ LRESULT CALLBACK ProcessListWndProc(HWND * subtract it from our clip rect because we don't * use icons in this list control. */ - ListView_GetItemRect(hWnd, 0, &rcClip, LVIR_BOUNDS); - ListView_GetItemRect(hWnd, ListView_GetItemCount(hWnd) - 1, &rcItem, LVIR_BOUNDS); + rcClip.left = LVIR_BOUNDS; + SendMessage(hWnd, LVM_GETITEMRECT, 0, (LPARAM) &rcClip); + rcItem.left = LVIR_BOUNDS; + SendMessage(hWnd, LVM_GETITEMRECT, ListView_GetItemCount(hWnd) - 1, (LPARAM) &rcItem); + rcClip.bottom = rcItem.bottom; - ListView_GetItemRect(hWnd, 0, &rcItem, LVIR_ICON); + rcItem.left = LVIR_ICON; + SendMessage(hWnd, LVM_GETITEMRECT, 0, (LPARAM) &rcItem); rcClip.left = rcItem.right; /*

1 0

Mike McCormack : taskmgr: Fix some gcc 4.1 warnings.
by Alexandre Julliard 17 Mar '06

17 Mar '06

Module: wine Branch: refs/heads/master Commit: 33bf2e581a8a70c81595ffacd5b3efb3cfcc21ee URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=33bf2e581a8a70c81595ffa… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 17 18:37:00 2006 +0900 taskmgr: Fix some gcc 4.1 warnings. --- programs/taskmgr/debug.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/taskmgr/debug.c b/programs/taskmgr/debug.c index 2dfab7b..e6fe8a5 100644 --- a/programs/taskmgr/debug.c +++ b/programs/taskmgr/debug.c @@ -55,7 +55,7 @@ void ProcessPage_OnDebug(void) lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + SendMessage(hProcessPageListCtrl, LVM_GETITEM, 0, (LPARAM) &lvitem); if (lvitem.state & LVIS_SELECTED) break;

1 0

Mike McCormack : taskmgr: Fix some gcc 4.1 warnings.
by Alexandre Julliard 17 Mar '06

17 Mar '06

Module: wine Branch: refs/heads/master Commit: 83b94fc80400e04dc18b5878dac9ca69007d1976 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=83b94fc80400e04dc18b587… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 17 18:37:11 2006 +0900 taskmgr: Fix some gcc 4.1 warnings. --- programs/taskmgr/endproc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/taskmgr/endproc.c b/programs/taskmgr/endproc.c index 13853f6..7d32477 100644 --- a/programs/taskmgr/endproc.c +++ b/programs/taskmgr/endproc.c @@ -49,7 +49,7 @@ void ProcessPage_OnEndProcess(void) lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + SendMessage(hProcessPageListCtrl, LVM_GETITEM, 0, (LPARAM) &lvitem); if (lvitem.state & LVIS_SELECTED) break; @@ -97,7 +97,7 @@ void ProcessPage_OnEndProcessTree(void) lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + SendMessage(hProcessPageListCtrl, LVM_GETITEM, 0, (LPARAM) &lvitem); if (lvitem.state & LVIS_SELECTED) break;

1 0

Mike McCormack : taskmgr: Fix some gcc 4.1 warnings.
by Alexandre Julliard 17 Mar '06

17 Mar '06

Module: wine Branch: refs/heads/master Commit: 3be0cc810e1abf5063dd77ab2ecf248a66f2f834 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3be0cc810e1abf5063dd77a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 17 18:36:48 2006 +0900 taskmgr: Fix some gcc 4.1 warnings. --- programs/taskmgr/affinity.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/taskmgr/affinity.c b/programs/taskmgr/affinity.c index c73054a..c07a925 100644 --- a/programs/taskmgr/affinity.c +++ b/programs/taskmgr/affinity.c @@ -49,7 +49,7 @@ void ProcessPage_OnSetAffinity(void) lvitem.mask = LVIF_STATE; lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + SendMessage(hProcessPageListCtrl, LVM_GETITEM, 0, (LPARAM) &lvitem); if (lvitem.state & LVIS_SELECTED) break; }

1 0

Mike McCormack : regedit: Fix some gcc 4.1 warnings.
by Alexandre Julliard 17 Mar '06

17 Mar '06

Module: wine Branch: refs/heads/master Commit: 01d99121e544ee27d4aca0fb6aa5df9c2df154a0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=01d99121e544ee27d4aca0f… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 17 18:34:05 2006 +0900 regedit: Fix some gcc 4.1 warnings. --- programs/regedit/treeview.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index f040d81..db31c94 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -134,7 +134,7 @@ HTREEITEM FindPathInTree(HWND hwndTV, LP buf[260] = '\0'; hItem = TreeView_GetRoot(hwndTV); - TreeView_Expand(hwndTV, hItem, TVE_EXPAND); + SendMessage(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hItem ); hItem = TreeView_GetChild(hwndTV, hItem); hOldItem = hItem; while(1) { @@ -145,9 +145,9 @@ HTREEITEM FindPathInTree(HWND hwndTV, LP tvi.hItem = hItem; tvi.pszText = buf; tvi.cchTextMax = 260; - TreeView_GetItem(hwndTV, &tvi); + SendMessage(hwndTV, TVM_GETITEM, 0, (LPARAM) &tvi); if (!_tcsicmp(tvi.pszText, lpItemName)) { - TreeView_Expand(hwndTV, hItem, TVE_EXPAND); + SendMessage(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hItem ); if (!lpKeyName) return hItem; hOldItem = hItem; @@ -425,7 +425,7 @@ static BOOL RefreshTreeItem(HWND hwndTV, while (childItem) { HTREEITEM nextItem = TreeView_GetNextSibling(hwndTV, childItem); if (RefreshTreeItem(hwndTV, childItem) == FALSE) { - TreeView_DeleteItem(hwndTV, childItem); + SendMessage(hwndTV, TVM_DELETEITEM, 0, (LPARAM)childItem); } childItem = nextItem; } @@ -455,7 +455,7 @@ BOOL RefreshTreeView(HWND hwndTV) SetCursor(hcursorOld); /* We reselect the currently selected node, this will prompt a refresh of the listview. */ - TreeView_SelectItem(hwndTV, hSelectedItem); + SendMessage(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hSelectedItem); return TRUE; } @@ -476,7 +476,7 @@ HTREEITEM InsertNode(HWND hwndTV, HTREEI item.cChildren = 1; if (!TreeView_SetItem(hwndTV, &item)) return FALSE; } - TreeView_Expand(hwndTV, hItem, TVE_EXPAND); + SendMessage(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hItem ); if (!hNewItem) { for(hNewItem = TreeView_GetChild(hwndTV, hItem); hNewItem; hNewItem = TreeView_GetNextSibling(hwndTV, hNewItem)) { item.mask = TVIF_HANDLE | TVIF_TEXT; @@ -487,7 +487,8 @@ HTREEITEM InsertNode(HWND hwndTV, HTREEI if (lstrcmp(name, item.pszText) == 0) break; } } - if (hNewItem) TreeView_SelectItem(hwndTV, hNewItem); + if (hNewItem) + SendMessage(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hNewItem); return hNewItem; } @@ -528,8 +529,8 @@ static BOOL InitTreeViewItems(HWND hwndT if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_DYN_DATA"), HKEY_DYN_DATA, 1)) return FALSE; /* expand and select host name */ - TreeView_Expand(hwndTV, hRoot, TVE_EXPAND); - TreeView_Select(hwndTV, hRoot, TVGN_CARET); + SendMessage(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hRoot ); + SendMessage(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); return TRUE; } @@ -567,7 +568,7 @@ static BOOL InitTreeViewImageLists(HWND } /* Associate the image list with the tree view control. */ - TreeView_SetImageList(hwndTV, himl, TVSIL_NORMAL); + SendMessage(hwndTV, TVM_SETIMAGELIST, TVSIL_NORMAL, (LPARAM)himl); return TRUE; }

1 0

Juan Lang : crypt32: Implement CertGetSubjectCertificateFromStore.
by Alexandre Julliard 17 Mar '06

17 Mar '06

Module: wine Branch: refs/heads/master Commit: ae5823db3f193bcc039117dd94e2cf486c4c0f96 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ae5823db3f193bcc039117d… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Mar 16 19:22:56 2006 -0800 crypt32: Implement CertGetSubjectCertificateFromStore. --- dlls/crypt32/crypt32.spec | 2 + dlls/crypt32/store.c | 19 ++++++++++++-- dlls/crypt32/tests/store.c | 61 ++++++++++++++++++++++++++++++++++++++++++++ include/wincrypt.h | 3 ++ 4 files changed, 82 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 4fc11b3..0d08594 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -55,7 +55,7 @@ @ stdcall CertGetNameStringA(ptr long long ptr ptr long) @ stdcall CertGetNameStringW(ptr long long ptr ptr long) @ stub CertGetPublicKeyLength -@ stub CertGetSubjectCertificateFromStore +@ stdcall CertGetSubjectCertificateFromStore(ptr long ptr) @ stdcall CertGetValidUsages(long ptr ptr ptr ptr) @ stub CertIsRDNAttrsInCertificateName @ stdcall CertNameToStrA(long ptr long ptr long) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 495ca03..cf896f7 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -866,9 +866,10 @@ static PWINECRYPT_CERTSTORE CRYPT_ProvOp dwFlags, pvPara, NULL, &provInfo); else { - PWINECRYPT_CERTSTORE memStore; + HCERTSTORE memStore; - memStore = CRYPT_MemOpenStore(hCryptProv, dwFlags, NULL); + memStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); if (memStore) { if (provOpenFunc(lpszStoreProvider, dwEncodingType, hCryptProv, @@ -2559,6 +2560,20 @@ PCCERT_CONTEXT WINAPI CertFindCertificat return ret; } +PCCERT_CONTEXT WINAPI CertGetSubjectCertificateFromStore(HCERTSTORE hCertStore, + DWORD dwCertEncodingType, PCERT_INFO pCertId) +{ + TRACE("(%p, %08lx, %p)\n", hCertStore, dwCertEncodingType, pCertId); + + if (!pCertId) + { + SetLastError(HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER)); + return NULL; + } + return CertFindCertificateInStore(hCertStore, dwCertEncodingType, 0, + CERT_FIND_SUBJECT_CERT, pCertId, NULL); +} + BOOL WINAPI CertAddStoreToCollection(HCERTSTORE hCollectionStore, HCERTSTORE hSiblingStore, DWORD dwUpdateFlags, DWORD dwPriority) { diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index c147afb..68356f7 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -261,6 +261,66 @@ static void testFindCert(void) } } +static void testGetSubjectCert(void) +{ + HCERTSTORE store; + + store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + ok(store, "CertOpenStore failed: %ld\n", GetLastError()); + if (store != NULL) + { + PCCERT_CONTEXT context1, context2; + CERT_INFO info = { 0 }; + BOOL ret; + + ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, + bigCert, sizeof(bigCert), CERT_STORE_ADD_ALWAYS, NULL); + ok(ret, "CertAddEncodedCertificateToStore failed: %08lx\n", + GetLastError()); + ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, + bigCert2, sizeof(bigCert2), CERT_STORE_ADD_NEW, &context1); + ok(ret, "CertAddEncodedCertificateToStore failed: %08lx\n", + GetLastError()); + ok(context1 != NULL, "Expected a context\n"); + ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, + certWithUsage, sizeof(certWithUsage), CERT_STORE_ADD_NEW, NULL); + ok(ret, "CertAddEncodedCertificateToStore failed: %08lx\n", + GetLastError()); + + context2 = CertGetSubjectCertificateFromStore(store, X509_ASN_ENCODING, + NULL); + ok(!context2 && GetLastError() == + HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), + "Expected HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), got %08lx\n", + GetLastError()); + context2 = CertGetSubjectCertificateFromStore(store, X509_ASN_ENCODING, + &info); + ok(!context2 && GetLastError() == CRYPT_E_NOT_FOUND, + "Expected CRYPT_E_NOT_FOUND, got %08lx\n", GetLastError()); + info.SerialNumber.cbData = sizeof(serialNum); + info.SerialNumber.pbData = (LPBYTE)serialNum; + context2 = CertGetSubjectCertificateFromStore(store, X509_ASN_ENCODING, + &info); + ok(!context2 && GetLastError() == CRYPT_E_NOT_FOUND, + "Expected CRYPT_E_NOT_FOUND, got %08lx\n", GetLastError()); + info.Issuer.cbData = sizeof(subjectName2); + info.Issuer.pbData = (LPBYTE)subjectName2; + context2 = CertGetSubjectCertificateFromStore(store, X509_ASN_ENCODING, + &info); + ok(context2 != NULL, + "CertGetSubjectCertificateFromStore failed: %08lx\n", GetLastError()); + /* Not only should this find a context, but it should be the same + * (same address) as context1. + */ + ok(context1 == context2, "Expected identical context addresses\n"); + CertFreeCertificateContext(context2); + + CertFreeCertificateContext(context1); + CertCloseStore(store, 0); + } +} + static void testMemStore(void) { HCERTSTORE store1, store2; @@ -1534,6 +1594,7 @@ START_TEST(store) { testDupCert(); testFindCert(); + testGetSubjectCert(); /* various combinations of CertOpenStore */ testMemStore(); diff --git a/include/wincrypt.h b/include/wincrypt.h index 9784223..085d310 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2693,6 +2693,9 @@ PCCTL_CONTEXT WINAPI CertFindCTLInStore( DWORD dwCertEncodingType, DWORD dwFindFlags, DWORD dwFindType, const void *pvFindPara, PCCTL_CONTEXT pPrevCtlContext); +PCCERT_CONTEXT WINAPI CertGetSubjectCertificateFromStore(HCERTSTORE hCertStore, + DWORD dwCertEncodingType, PCERT_INFO pCertId); + BOOL WINAPI CertSerializeCertificateStoreElement(PCCERT_CONTEXT pCertContext, DWORD dwFlags, BYTE *pbElement, DWORD *pcbElement);

1 0

Stefan Dösinger : wined3d: Add D3DBASISTYPE to wined3d_types.h.
by Alexandre Julliard 17 Mar '06

17 Mar '06

Module: wine Branch: refs/heads/master Commit: 7870a5a6a1b99d219e6df9560411a702183dfcec URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7870a5a6a1b99d219e6df95… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Mar 16 23:29:07 2006 +0100 wined3d: Add D3DBASISTYPE to wined3d_types.h. --- include/wine/wined3d_types.h | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index d5fe5f7..b265c90 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -410,13 +410,21 @@ typedef enum _WINED3DTEXTURESTAGESTATETY #define WINED3D_HIGHEST_TEXTURE_STATE WINED3DTSS_CONSTANT +typedef enum _WINED3DBASISTYPE { + WINED3DBASIS_BEZIER = 0, + WINED3DBASIS_BSPLINE = 1, + WINED3DBASIS_INTERPOLATE = 2, + + WINED3DBASIS_FORCE_DWORD = 0x7fffffff +} WINED3DBASISTYPE; + typedef struct _WINEDD3DRECTPATCH_INFO { UINT StartVertexOffsetWidth; UINT StartVertexOffsetHeight; UINT Width; UINT Height; UINT Stride; - D3DBASISTYPE Basis; + WINED3DBASISTYPE Basis; WINED3DDEGREETYPE Degree; } WINED3DRECTPATCH_INFO;

1 0

Roderick Colenbrander : d3d8/wined3d: Vertex shader fixes.
by Alexandre Julliard 17 Mar '06

17 Mar '06

Module: wine Branch: refs/heads/master Commit: bcbf5f397e56b88d9f22fe01c33e03ab38023168 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bcbf5f397e56b88d9f22fe0… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Mar 16 22:42:00 2006 +0100 d3d8/wined3d: Vertex shader fixes. --- dlls/d3d8/device.c | 7 + dlls/wined3d/device.c | 31 +++-- dlls/wined3d/vertexshader.c | 248 +++++++++++++++++++++++-------------------- 3 files changed, 152 insertions(+), 134 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=bcbf5f397e56b88d9f2…

1 0

Alexandre Julliard : gdi: Support for loading fonts from the build directory.
by Alexandre Julliard 17 Mar '06

17 Mar '06

Module: wine Branch: refs/heads/master Commit: 17b13bdc07dd477399a66a44ebf0c773032135bb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=17b13bdc07dd477399a66a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 17 13:10:09 2006 +0100 gdi: Support for loading fonts from the build directory. --- dlls/gdi/freetype.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index a365778..f38ef1b 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -1128,6 +1128,8 @@ static BOOL load_font_from_data_dir(LPCW BOOL ret = FALSE; const char *data_dir = wine_get_data_dir(); + if (!data_dir) data_dir = wine_get_build_dir(); + if (data_dir) { INT len;

1 0

Alexandre Julliard : winecfg: Support for loading the list of dlls from the build directory.
by Alexandre Julliard 17 Mar '06

17 Mar '06

Module: wine Branch: refs/heads/master Commit: bbb43033153c9bfca6e53c35c9e04685281cf078 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bbb43033153c9bfca6e53c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 17 13:09:54 2006 +0100 winecfg: Support for loading the list of dlls from the build directory. --- programs/winecfg/libraries.c | 53 ++++++++++++++++++++++++++++++++---------- 1 files changed, 41 insertions(+), 12 deletions(-) diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index f4f4a80..6679976 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -32,6 +32,9 @@ #include <dirent.h> #include <assert.h> #include <stdlib.h> +#ifdef HAVE_SYS_STAT_H +#include <sys/stat.h> +#endif #ifdef HAVE_UNISTD_H #include <unistd.h> #endif @@ -252,38 +255,63 @@ static int is_16bit_dll( const char *dir } /* load the list of available libraries from a given dir */ -static void load_library_list_from_dir( HWND dialog, const char *dir_path ) +static void load_library_list_from_dir( HWND dialog, const char *dir_path, int check_subdirs ) { - char name[256]; + char *buffer = NULL, name[256]; struct dirent *de; DIR *dir = opendir( dir_path ); if (!dir) return; + if (check_subdirs) + buffer = HeapAlloc( GetProcessHeap(), 0, strlen(dir_path) + 2 * sizeof(name) + 10 ); + while ((de = readdir( dir ))) { size_t len = strlen(de->d_name); - if (len > sizeof(name) || len <= 7 || strcmp( de->d_name + len - 7, ".dll.so")) continue; - if (is_16bit_dll( dir_path, de->d_name )) continue; /* 16-bit dlls can't be configured */ - len -= 7; - memcpy( name, de->d_name, len ); - name[len] = 0; - /* skip dlls that should always be builtin */ - if (is_builtin_only( name )) continue; - SendDlgItemMessageA( dialog, IDC_DLLCOMBO, CB_ADDSTRING, 0, (LPARAM)name ); + if (len > sizeof(name)) continue; + if (len > 7 && !strcmp( de->d_name + len - 7, ".dll.so")) + { + if (is_16bit_dll( dir_path, de->d_name )) continue; /* 16-bit dlls can't be configured */ + len -= 7; + memcpy( name, de->d_name, len ); + name[len] = 0; + /* skip dlls that should always be builtin */ + if (is_builtin_only( name )) continue; + SendDlgItemMessageA( dialog, IDC_DLLCOMBO, CB_ADDSTRING, 0, (LPARAM)name ); + } + else if (check_subdirs) + { + struct stat st; + if (is_builtin_only( de->d_name )) continue; + sprintf( buffer, "%s/%s/%s.dll.so", dir_path, de->d_name, de->d_name ); + if (!stat( buffer, &st )) + SendDlgItemMessageA( dialog, IDC_DLLCOMBO, CB_ADDSTRING, 0, (LPARAM)de->d_name ); + } } closedir( dir ); + HeapFree( GetProcessHeap(), 0, buffer ); } /* load the list of available libraries */ static void load_library_list( HWND dialog ) { unsigned int i = 0; - const char *path; + const char *path, *build_dir = wine_get_build_dir(); char item1[256], item2[256]; + HCURSOR old_cursor = SetCursor( LoadCursor(0, IDC_WAIT) ); + + if (build_dir) + { + char *dir = HeapAlloc( GetProcessHeap(), 0, strlen(build_dir) + sizeof("/dlls") ); + strcpy( dir, build_dir ); + strcat( dir, "/dlls" ); + load_library_list_from_dir( dialog, dir, TRUE ); + HeapFree( GetProcessHeap(), 0, dir ); + } while ((path = wine_dll_enum_load_path( i++ ))) - load_library_list_from_dir( dialog, path ); + load_library_list_from_dir( dialog, path, FALSE ); /* get rid of duplicate entries */ @@ -301,6 +329,7 @@ static void load_library_list( HWND dial i++; } } + SetCursor( old_cursor ); } static void load_library_settings(HWND dialog)

1 0

Alexandre Julliard : libwine: Added magic handling of dll path when running in build dir.
by Alexandre Julliard 17 Mar '06

17 Mar '06

Module: wine Branch: refs/heads/master Commit: 4db364cb771742f1493b092d8a491aa0eaca8e16 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4db364cb771742f1493b092… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 17 13:08:08 2006 +0100 libwine: Added magic handling of dll path when running in build dir. This should ensure that we do the right thing in the build dir even if WINEDLLPATH isn't set. --- libs/wine/loader.c | 52 +++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 43 insertions(+), 9 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index b659694..e46ae30 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -56,8 +56,10 @@ char **__wine_main_environ = NULL; struct dll_path_context { - int index; - char *buffer; + int index; /* current index in the dll path list */ + char *buffer; /* buffer used for storing path names */ + char *name; /* start of file name part in buffer (including leading slash) */ + int namelen; /* length of file name without .so extension */ }; #define MAX_DLLS 100 @@ -74,6 +76,7 @@ static const IMAGE_NT_HEADERS *main_exe; static load_dll_callback_t load_dll_callback; +static const char *build_dir; static const char *default_dlldir; static const char **dll_paths; static int nb_dll_paths; @@ -112,6 +115,10 @@ static void build_dll_path(void) dll_path_maxlen = strlen(dlldir); dll_paths[nb_dll_paths++] = dlldir; } + else if ((build_dir = wine_get_build_dir())) + { + dll_path_maxlen = strlen(build_dir) + sizeof("/programs"); + } if (count) { @@ -144,18 +151,43 @@ inline static int file_exists( const cha return (fd != -1); } +inline static char *prepend( char *buffer, const char *str, size_t len ) +{ + return memcpy( buffer - len, str, len ); +} /* get a filename from the next entry in the dll path */ static char *next_dll_path( struct dll_path_context *context ) { int index = context->index++; + int namelen = context->namelen; + char *path = context->name; - if (index < nb_dll_paths) + switch(index) { - int len = strlen( dll_paths[index] ); - char *path = context->buffer + dll_path_maxlen - len; - memcpy( path, dll_paths[index], len ); + case 0: /* try programs dir for .exe files */ + if (namelen > 4 && !memcmp( context->name + namelen - 4, ".exe", 4 )) + { + path = prepend( path, context->name, namelen - 4 ); + path = prepend( path, "/programs", sizeof("/programs") - 1 ); + path = prepend( path, build_dir, strlen(build_dir) ); + return path; + } + context->index++; + /* fall through */ + case 1: /* try dlls dir with subdir prefix */ + if (namelen > 4 && !memcmp( context->name + namelen - 4, ".dll", 4 )) namelen -= 4; + path = prepend( path, context->name, namelen ); + /* fall through */ + case 2: /* try dlls dir without prefix */ + path = prepend( path, "/dlls", sizeof("/dlls") - 1 ); + path = prepend( path, build_dir, strlen(build_dir) ); return path; + default: + index -= 3; + if (index < nb_dll_paths) + return prepend( context->name, dll_paths[index], strlen( dll_paths[index] )); + break; } return NULL; } @@ -167,11 +199,13 @@ static char *first_dll_path( const char char *p; int namelen = strlen( name ); - context->buffer = p = malloc( dll_path_maxlen + namelen + strlen(ext) + 2 ); - context->index = 0; + context->buffer = malloc( dll_path_maxlen + 2 * namelen + strlen(ext) + 3 ); + context->index = build_dir ? 0 : 3; /* if no build dir skip all the build dir magic cases */ + context->name = context->buffer + dll_path_maxlen + namelen + 1; + context->namelen = namelen + 1; /* store the name at the end of the buffer, followed by extension */ - p += dll_path_maxlen; + p = context->name; *p++ = '/'; memcpy( p, name, namelen ); strcpy( p + namelen, ext );

1 0

Detlef Riekenberg : winbase.h: Add missing LMEM_INVALID_HANDLE define.
by Alexandre Julliard 16 Mar '06

16 Mar '06

Module: wine Branch: refs/heads/master Commit: 060d53748dc3d696f16c0d24ebf490735c79ed43 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=060d53748dc3d696f16c0d2… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Mar 16 19:52:47 2006 +0100 winbase.h: Add missing LMEM_INVALID_HANDLE define. --- include/winbase.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index aeee6a0..fbbbbcd 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -404,8 +404,9 @@ typedef struct _PROCESS_HEAP_ENTRY #define LMEM_ZEROINIT 0x0040 #define LMEM_MODIFY 0x0080 #define LMEM_DISCARDABLE 0x0F00 -#define LMEM_DISCARDED 0x4000 -#define LMEM_LOCKCOUNT 0x00FF +#define LMEM_DISCARDED 0x4000 +#define LMEM_INVALID_HANDLE 0x8000 +#define LMEM_LOCKCOUNT 0x00FF #define LPTR (LMEM_FIXED | LMEM_ZEROINIT) #define LHND (LMEM_MOVEABLE | LMEM_ZEROINIT)

1 0

Alexandre Julliard : libwine: Export wine_get_build_dir.
by Alexandre Julliard 16 Mar '06

16 Mar '06

Module: wine Branch: refs/heads/master Commit: 5ff1004c4d853691974bab0d0389b2fd06418939 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5ff1004c4d853691974bab0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 16 17:36:19 2006 +0100 libwine: Export wine_get_build_dir. --- include/wine/library.h | 1 + libs/wine/config.c | 6 ++++++ libs/wine/wine.def | 1 + libs/wine/wine.map | 1 + 4 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/wine/library.h b/include/wine/library.h index 385256d..3555d57 100644 --- a/include/wine/library.h +++ b/include/wine/library.h @@ -29,6 +29,7 @@ /* configuration */ +extern const char *wine_get_build_dir(void); extern const char *wine_get_config_dir(void); extern const char *wine_get_data_dir(void); extern const char *wine_get_server_dir(void); diff --git a/libs/wine/config.c b/libs/wine/config.c index 79146d3..5aadf73 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -356,6 +356,12 @@ const char *wine_get_data_dir(void) return datadir; } +/* retrieve the wine build dir (if we are running from there) */ +const char *wine_get_build_dir(void) +{ + return build_dir; +} + /* return the full name of the server directory (the one containing the socket) */ const char *wine_get_server_dir(void) { diff --git a/libs/wine/wine.def b/libs/wine/wine.def index 0388374..7f4ec26 100644 --- a/libs/wine/wine.def +++ b/libs/wine/wine.def @@ -25,6 +25,7 @@ EXPORTS wine_dlopen wine_dlsym wine_exec_wine_binary + wine_get_build_dir wine_get_config_dir wine_get_cs wine_get_data_dir diff --git a/libs/wine/wine.map b/libs/wine/wine.map index 3a9c72a..a7e6f1d 100644 --- a/libs/wine/wine.map +++ b/libs/wine/wine.map @@ -25,6 +25,7 @@ WINE_1.0 wine_dlopen; wine_dlsym; wine_exec_wine_binary; + wine_get_build_dir; wine_get_config_dir; wine_get_cs; wine_get_data_dir;

1 0

Alexandre Julliard : libwine: Added support for executing wine binaries out of the build dir.
by Alexandre Julliard 16 Mar '06

16 Mar '06

Module: wine Branch: refs/heads/master Commit: bf566139d721defa3ee64121274b425f3e7b0899 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bf566139d721defa3ee6412… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 16 17:35:32 2006 +0100 libwine: Added support for executing wine binaries out of the build dir. --- dlls/ntdll/server.c | 4 ++-- libs/wine/config.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index aff0b8a..b647352 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -598,7 +598,7 @@ static void start_server(void) if (pid == -1) fatal_perror( "fork" ); if (!pid) { - argv[0] = "wineserver"; + argv[0] = "server/wineserver"; argv[1] = TRACE_ON(server) ? "-d" : NULL; argv[2] = NULL; wine_exec_wine_binary( argv[0], argv, getenv("WINESERVER") ); @@ -797,7 +797,7 @@ static void create_config_dir(void) { const char *argv[6]; - argv[0] = "wineprefixcreate"; + argv[0] = "tools/wineprefixcreate"; argv[1] = "--quiet"; argv[2] = "--wait"; argv[3] = "--prefix"; diff --git a/libs/wine/config.c b/libs/wine/config.c index 1c2a325..79146d3 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -427,6 +427,18 @@ void wine_exec_wine_binary( const char * use_preloader = 1; } + if ((ptr = strrchr( name, '/' ))) + { + /* if we are in build dir and name contains a path, try that */ + if (build_dir) + { + argv[0] = build_path( build_dir, name ); + preloader_exec( argv, use_preloader ); + free( argv[0] ); + } + name = ptr + 1; /* get rid of path */ + } + /* first, bin directory from the current libdir or argv0 */ if (bindir) {

1 0

Alexandre Julliard : libwine: Added detection for Wine being run out of the build directory.
by Alexandre Julliard 16 Mar '06

16 Mar '06

Module: wine Branch: refs/heads/master Commit: 77b3b92eb2cc8b684f7c72d3ba33a5cafef8a48d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=77b3b92eb2cc8b684f7c72d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 16 17:35:14 2006 +0100 libwine: Added detection for Wine being run out of the build directory. --- libs/wine/config.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 58 insertions(+), 3 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 9bafe0f..1c2a325 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -44,6 +44,7 @@ static char *dlldir; static char *datadir; static char *config_dir; static char *server_dir; +static char *build_dir; static char *user_name; static char *argv0_name; @@ -233,21 +234,66 @@ static void init_paths(void) init_server_dir( st.st_dev, st.st_ino ); } +/* check if we are running from the build directory */ +static char *running_from_build_dir( const char *basedir, const char *bindir ) +{ + struct stat st; + const char *p; + char *path, *end; + int res; + + if (!(path = build_path( bindir, "wineserver" ))) return NULL; + res = stat( path, &st ); + free( path ); + if (res != -1) return NULL; /* the real bindir is valid */ + + /* remove last component from basedir */ + p = basedir + strlen(basedir) - 1; + while (p > basedir && *p == '/') p--; + while (p > basedir && *p != '/') p--; + if (p == basedir) return NULL; + path = xmalloc( p - basedir + sizeof("/dlls/ntdll/ntdll.dll.so") ); + memcpy( path, basedir, p - basedir ); + end = path + (p - basedir); + + strcpy( end, "/server/wineserver" ); + if (stat( path, &st ) == -1) + { + free( path ); + return NULL; /* no wineserver found */ + } + + /* check for ntdll too to make sure */ + strcpy( end, "/dlls/ntdll/ntdll.dll.so" ); + if (stat( path, &st ) == -1) + { + free( path ); + return NULL; /* no ntdll found */ + } + + *end = 0; + return path; +} + /* initialize the argv0 path */ void wine_init_argv0_path( const char *argv0 ) { size_t size, len; - const char *p, *libdir; + const char *p, *libdir, *basename; char *cwd; if (!(p = strrchr( argv0, '/' ))) - argv0_name = xstrdup( argv0 ); + basename = argv0; else - argv0_name = xstrdup( p + 1 ); + basename = p + 1; + + argv0_name = xstrdup( basename ); if ((libdir = get_runtime_libdir())) { bindir = build_path( libdir, LIB_TO_BINDIR ); + if ((build_dir = running_from_build_dir( libdir, bindir ))) goto in_build_dir; + dlldir = build_path( libdir, LIB_TO_DLLDIR ); datadir = build_path( libdir, LIB_TO_DATADIR ); return; @@ -284,8 +330,17 @@ void wine_init_argv0_path( const char *a } } + if ((build_dir = running_from_build_dir( bindir, bindir ))) goto in_build_dir; + dlldir = build_path( bindir, BIN_TO_DLLDIR ); datadir = build_path( bindir, BIN_TO_DATADIR ); + return; + +in_build_dir: + free( bindir ); + free( argv0_name ); + bindir = NULL; + argv0_name = build_path( "loader/", basename ); } /* return the configuration directory ($WINEPREFIX or $HOME/.wine) */

1 0

Alexandre Julliard : dlls: Remove the no longer needed symlinks to the static libraries.
by Alexandre Julliard 16 Mar '06

16 Mar '06

Module: wine Branch: refs/heads/master Commit: 7fb2ae6ec6f844c94d8105352fea937866aeda04 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7fb2ae6ec6f844c94d81053… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 16 17:25:06 2006 +0100 dlls: Remove the no longer needed symlinks to the static libraries. --- dlls/Makefile.in | 38 +++++++------------------------------- dlls/make_dlls | 13 ++++--------- 2 files changed, 11 insertions(+), 40 deletions(-) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index b90abb7..7995d67 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -316,12 +316,6 @@ SYMLINKS_SO = \ itss.dll.so \ joystick.drv.so \ kernel32.dll.so \ - libdxerr8.a \ - libdxerr9.a \ - libdxguid.a \ - libstrmiids.a \ - libuuid.a \ - libwinecrt0.a \ lz32.dll.so \ mapi32.dll.so \ mciavi32.dll.so \ @@ -1046,24 +1040,6 @@ wsock32.dll.so: wsock32/wsock32.dll.so wtsapi32.dll.so: wtsapi32/wtsapi32.dll.so $(RM) $@ && $(LN_S) wtsapi32/wtsapi32.dll.so $@ -libdxerr8.a: dxerr8/libdxerr8.a - $(RM) $@ && $(LN_S) dxerr8/libdxerr8.a $@ - -libdxerr9.a: dxerr9/libdxerr9.a - $(RM) $@ && $(LN_S) dxerr9/libdxerr9.a $@ - -libdxguid.a: dxguid/libdxguid.a - $(RM) $@ && $(LN_S) dxguid/libdxguid.a $@ - -libstrmiids.a: strmiids/libstrmiids.a - $(RM) $@ && $(LN_S) strmiids/libstrmiids.a $@ - -libuuid.a: uuid/libuuid.a - $(RM) $@ && $(LN_S) uuid/libuuid.a $@ - -libwinecrt0.a: winecrt0/libwinecrt0.a - $(RM) $@ && $(LN_S) winecrt0/libwinecrt0.a $@ - # Import libraries @@ -1074,16 +1050,16 @@ IMPORT_SYMLINKS = \ libgdi32.$(IMPLIBEXT) \ libkernel32.$(IMPLIBEXT) \ libmsacm32.$(IMPLIBEXT) \ - libuser32.$(IMPLIBEXT) \ - libdxerr8.a \ - libdxerr9.a \ - libdxguid.a \ - libstrmiids.a \ - libuuid.a \ - libwinecrt0.a + libuser32.$(IMPLIBEXT) IMPORT_LIBS = \ $(IMPORT_SYMLINKS) \ + dxerr8/libdxerr8.a \ + dxerr9/libdxerr9.a \ + dxguid/libdxguid.a \ + strmiids/libstrmiids.a \ + uuid/libuuid.a \ + winecrt0/libwinecrt0.a \ activeds/libactiveds.$(IMPLIBEXT) \ advapi32/libadvapi32.$(IMPLIBEXT) \ advpack/libadvpack.$(IMPLIBEXT) \ diff --git a/dlls/make_dlls b/dlls/make_dlls index 0a9012b..ccc98d2 100755 --- a/dlls/make_dlls +++ b/dlls/make_dlls @@ -66,6 +66,7 @@ foreach my $i (split(/\s/,$makefiles)) if ($module =~ /^lib.*\.a$/) { ($staticlib_dirs{$module} = $i) =~ s/^\.\/(.*)\/[^\/]+$/$1/; + die "invalid module $module in dir $staticlib_dirs{$module}\n" if "lib$staticlib_dirs{$module}.a" ne $module; } else { @@ -173,7 +174,6 @@ foreach my $mod (sort keys %directories) $targets16{$i . "16"} = $mod; } } -foreach my $mod (sort keys %staticlib_dirs) { $targets{$mod} = 1; } print NEWMAKE <<EOF; @@ -236,11 +236,6 @@ foreach my $mod (sort keys %directories) printf NEWMAKE "\techo \"%s\" >\$\@\n\n", $mod; } } -foreach my $mod (sort keys %staticlib_dirs) -{ - printf NEWMAKE "%s: %s/%s\n", $mod, $staticlib_dirs{$mod}, $mod; - printf NEWMAKE "\t\$(RM) \$@ && \$(LN_S) %s/%s \$@\n\n", $staticlib_dirs{$mod}, $mod; -} ################################################################ # output the import libraries rules @@ -260,12 +255,12 @@ foreach my $mod (sort @lib_symlinks) { printf NEWMAKE " \\\n\t%s.\$(IMPLIBEXT)", $importlibs{$mod}; } + +print NEWMAKE "\n\nIMPORT_LIBS = \\\n\t\$(IMPORT_SYMLINKS)"; foreach my $mod (sort keys %staticlib_dirs) { - printf NEWMAKE " \\\n\t%s", $mod; + printf NEWMAKE " \\\n\t%s/%s", $staticlib_dirs{$mod}, $mod; } - -print NEWMAKE "\n\nIMPORT_LIBS = \\\n\t\$(IMPORT_SYMLINKS)"; foreach my $mod (sort keys %importlibs) { my $dir = $directories{$mod};

1 0

Alexandre Julliard : Remove some no longer needed library paths.
by Alexandre Julliard 16 Mar '06

16 Mar '06

Module: wine Branch: refs/heads/master Commit: 5319db6332fc0c255c72259668bb185022141085 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5319db6332fc0c255c72259… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 16 16:28:43 2006 +0100 Remove some no longer needed library paths. --- dlls/Makedll.rules.in | 4 ++-- dlls/Maketest.rules.in | 3 +-- programs/Makeprog.rules.in | 5 ++--- programs/avitools/Makefile.in | 6 +++--- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index f4ece64..504ee0e 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -19,7 +19,7 @@ MAINSPEC = $(BASEMODULE).spec SPEC_DEF = lib$(BASEMODULE).def WIN16_FILES = $(SPEC_SRCS16:.spec=.spec.o) $(C_SRCS16:.c=.o) $(EXTRA_OBJS16) ALL_OBJS = @WIN16_FILES@ $(OBJS) $(RC_SRCS:.rc=.res) -ALL_LIBS = $(LIBWINE) $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS) +ALL_LIBS = -L$(LIBDIR) -lwine $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS) ALL_IMPORTS = $(DELAYIMPORTS) $(IMPORTS) IMPLIB_OBJS = $(IMPLIB_SRCS:.c=.o) STATICIMPLIB= $(IMPORTLIB:.def=.def.a) @@ -32,7 +32,7 @@ all: $(MODULE)$(DLLEXT) $(SUBDIRS) # Rules for .so files $(MODULE).so: $(MAINSPEC) $(ALL_OBJS) Makefile.in - $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(SUBSYSTEM:%=-Wb,--subsystem,%) $(BASEADDRESS:%=-Wl,--image-base,%) -o $@ $(DLL_LDPATH) $(ALL_IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) + $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(SUBSYSTEM:%=-Wb,--subsystem,%) $(BASEADDRESS:%=-Wl,--image-base,%) -o $@ -L$(DLLDIR) $(ALL_IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) # Rules for .dll files diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in index c746471..c97034d 100644 --- a/dlls/Maketest.rules.in +++ b/dlls/Maketest.rules.in @@ -21,7 +21,6 @@ RUNTESTFLAGS = -q -P wine -M $(TESTDLL) C_SRCS = $(CTESTS) $(TESTLIST) ALL_LIBS = $(IMPORTS:%=-l%) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -DLL_LDPATH = -L$(DLLDIR) $(IMPORTS:%=-L$(DLLDIR)/%) CROSSTEST = $(TESTDLL:%.dll=%)_crosstest.exe CROSSOBJS = $(C_SRCS:.c=.cross.o) $(RC_SRCS:.rc=.res.cross.o) @@ -35,7 +34,7 @@ all: $(TESTPROGRAM) # Rules for .so main module $(MODULE).so: $(OBJS) $(RC_SRCS:.rc=.res) Makefile.in - $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mconsole $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(LIBPORT) $(DLL_LDPATH) -L$(LIBDIR) $(ALL_LIBS) + $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mconsole $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(LIBPORT) -L$(DLLDIR) -L$(LIBDIR) $(ALL_LIBS) # Rules for .exe main module diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in index 9052105..b39d1e7 100644 --- a/programs/Makeprog.rules.in +++ b/programs/Makeprog.rules.in @@ -13,8 +13,7 @@ DLLDEFS = @DLLDEFS@ DLLFLAGS = @DLLFLAGS@ DEFS = $(DLLDEFS) $(EXTRADEFS) ALL_IMPORTS = $(DELAYIMPORTS) $(IMPORTS) -ALL_LIBS = $(ALL_IMPORTS:%=-l%) $(LIBWINE) $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS) -DLL_LDPATH = -L$(DLLDIR) $(ALL_IMPORTS:%=-L$(DLLDIR)/%) +ALL_LIBS = $(ALL_IMPORTS:%=-l%) -L$(LIBDIR) -lwine $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS) BASEMODULE = $(MODULE:.exe=) RUNTESTFLAGS= -q -P wine -T $(TOPOBJDIR) @@ -25,7 +24,7 @@ all: $(MODULE)$(DLLEXT) $(BASEMODULE)$(E # Rules for .so main module $(MODULE).so: $(OBJS) $(RC_SRCS:.rc=.res) Makefile.in - $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(DLL_LDPATH) $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%) + $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ -L$(DLLDIR) $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%) $(BASEMODULE): $(WINEWRAPPER) $(RM) $@ && $(LN_S) $(WINEWRAPPER) $@ diff --git a/programs/avitools/Makefile.in b/programs/avitools/Makefile.in index 06cd46a..9a378af 100644 --- a/programs/avitools/Makefile.in +++ b/programs/avitools/Makefile.in @@ -19,13 +19,13 @@ C_SRCS = \ all: aviinfo.exe$(DLLEXT) aviplay.exe$(DLLEXT) icinfo.exe$(DLLEXT) aviinfo$(EXEEXT) aviplay$(EXEEXT) icinfo$(EXEEXT) aviinfo.exe.so: aviinfo.o - $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mwindows -o $@ aviinfo.o -L$(DLLDIR)/avifil32 -L$(DLLDIR) -lavifil32 -lkernel32 $(ALL_LIBS) + $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mwindows -o $@ aviinfo.o -L$(DLLDIR) -lavifil32 -lkernel32 $(ALL_LIBS) aviplay.exe.so: aviplay.o - $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mwindows -o $@ aviplay.o -L$(DLLDIR)/avifil32 -L$(DLLDIR)/ddraw -L$(DLLDIR) -lavifil32 -lddraw -lkernel32 $(ALL_LIBS) + $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mwindows -o $@ aviplay.o -L$(DLLDIR) -lavifil32 -lddraw -lkernel32 $(ALL_LIBS) icinfo.exe.so: icinfo.o - $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mwindows -o $@ icinfo.o -L$(DLLDIR)/msvfw32 -L$(DLLDIR) -lmsvfw32 -lkernel32 $(ALL_LIBS) + $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mwindows -o $@ icinfo.o -L$(DLLDIR) -lmsvfw32 -lkernel32 $(ALL_LIBS) aviinfo.exe: aviinfo.o $(CC) -o $@ aviinfo.o -lavifil32 $(ALL_LIBS)

1 0

Alexandre Julliard : winegcc: Look for libraries in subdirs of the library path too.
by Alexandre Julliard 16 Mar '06

16 Mar '06

Module: wine Branch: refs/heads/master Commit: 870d490eecdbfd6cdb945a4f387d92efdda22737 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=870d490eecdbfd6cdb945a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 16 16:28:04 2006 +0100 winegcc: Look for libraries in subdirs of the library path too. This means that -lfoo will match the library 'foo/libfoo.def' in addition to just 'libfoo.def'. This allows supporting the Wine source layout without adding a gazillion path entries. --- tools/winegcc/utils.c | 8 ++++ tools/winegcc/winegcc.c | 88 ++++++++++++++++++++++------------------------- 2 files changed, 49 insertions(+), 47 deletions(-) diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index b61b076..f66d34a 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -235,6 +235,14 @@ static char* try_lib_path(const char* di char *fullname; file_type type; + /* first try a subdir named from the library we are looking for */ + fullname = strmake("%s/%s/%s%s%s", dir, library, pre, library, ext); + if (verbose > 1) fprintf(stderr, "Try %s...", fullname); + type = get_file_type(fullname); + if (verbose > 1) fprintf(stderr, type == expected_type ? "FOUND!\n" : "no\n"); + if (type == expected_type) return fullname; + free( fullname ); + fullname = strmake("%s/%s%s%s", dir, pre, library, ext); if (verbose > 1) fprintf(stderr, "Try %s...", fullname); type = get_file_type(fullname); diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index e0a810e..43a6b07 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -382,6 +382,35 @@ static char *find_static_lib( const char return NULL; } +/* add specified library to the list of files */ +static void add_library( strarray *lib_dirs, strarray *files, const char *library ) +{ + char *static_lib, *fullname = 0; + + switch(get_lib_type(lib_dirs, library, &fullname)) + { + case file_arh: + strarray_add(files, strmake("-a%s", fullname)); + break; + case file_dll: + strarray_add(files, strmake("-d%s", fullname)); + if ((static_lib = find_static_lib(fullname))) + { + strarray_add(files, strmake("-a%s",static_lib)); + free(static_lib); + } + break; + case file_so: + strarray_add(files, strmake("-s%s", fullname)); + break; + default: + /* keep it anyway, the linker may know what to do with it */ + strarray_add(files, strmake("-l%s", library)); + break; + } + free(fullname); +} + static void build(struct options* opts) { static const char *stdlibpath[] = { DLLDIR, LIBDIR, "/usr/lib", "/usr/local/lib", "/lib" }; @@ -486,31 +515,7 @@ static void build(struct options* opts) } } else if (file[1] == 'l') - { - char *static_lib, *fullname = 0; - switch(get_lib_type(lib_dirs, file + 2, &fullname)) - { - case file_arh: - strarray_add(files, strmake("-a%s", fullname)); - break; - case file_dll: - strarray_add(files, strmake("-d%s", file + 2)); - if ((static_lib = find_static_lib(fullname))) - { - strarray_add(files, strmake("-a%s",static_lib)); - free(static_lib); - } - break; - case file_so: - strarray_add(files, strmake("-s%s", file + 2)); - break; - default: - /* keep it anyway, the linker may know what to do with it */ - strarray_add(files, file); - break; - } - free(fullname); - } + add_library( lib_dirs, files, file + 2 ); else if (file[1] == 'x') lang = file; } @@ -518,31 +523,23 @@ static void build(struct options* opts) error("A spec file is currently needed in shared mode"); /* add the default libraries, if needed */ - if (!opts->nostdlib) - { - if (opts->use_msvcrt) strarray_add(files, "-dmsvcrt"); - } + if (!opts->nostdlib && opts->use_msvcrt) add_library(lib_dirs, files, "msvcrt"); if (!opts->wine_mode && !opts->nodefaultlibs) { if (opts->gui_app) { - strarray_add(files, "-dshell32"); - strarray_add(files, "-dcomdlg32"); - strarray_add(files, "-dgdi32"); + add_library(lib_dirs, files, "shell32"); + add_library(lib_dirs, files, "comdlg32"); + add_library(lib_dirs, files, "gdi32"); } - strarray_add(files, "-dadvapi32"); - strarray_add(files, "-duser32"); - strarray_add(files, "-dkernel32"); + add_library(lib_dirs, files, "advapi32"); + add_library(lib_dirs, files, "user32"); + add_library(lib_dirs, files, "kernel32"); } - if (!opts->nostartfiles) - { - char *fullname = NULL; - if (get_lib_type(lib_dirs, "winecrt0", &fullname) == file_arh) - strarray_add(files, strmake("-a%s", fullname)); - free( fullname ); - } + if (!opts->nostartfiles) add_library(lib_dirs, files, "winecrt0"); + if (!opts->nostdlib) add_library(lib_dirs, files, "wine"); /* run winebuild to generate the .spec.o file */ spec_args = strarray_alloc(); @@ -588,12 +585,10 @@ static void build(struct options* opts) const char* name = files->base[j] + 2; switch(files->base[j][1]) { - case 'd': - strarray_add(spec_args, strmake("-l%s", name)); - break; case 'r': strarray_add(spec_args, files->base[j]); break; + case 'd': case 'a': case 'o': strarray_add(spec_args, name); @@ -633,9 +628,9 @@ static void build(struct options* opts) switch(files->base[j][1]) { case 'l': - case 's': strarray_add(link_args, strmake("-l%s", name)); break; + case 's': case 'a': case 'o': strarray_add(link_args, name); @@ -645,7 +640,6 @@ static void build(struct options* opts) if (!opts->nostdlib) { - strarray_add(link_args, "-lwine"); strarray_add(link_args, "-lm"); strarray_add(link_args, "-lc"); }

1 0

Kai Blin : secur32: Update ntlm_auth version detection to detect new samba4 version numbers.
by Alexandre Julliard 16 Mar '06

16 Mar '06

Module: wine Branch: refs/heads/master Commit: e6351700bc0e3e412f9cccb15106e671874fbb50 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e6351700bc0e3e412f9cccb… Author: Kai Blin <kai.blin(a)gmail.com> Date: Thu Mar 16 12:45:17 2006 +0100 secur32: Update ntlm_auth version detection to detect new samba4 version numbers. Samba4 changed the versioning from 3.9.X to 4.0.0tpX-preY. --- dlls/secur32/dispatcher.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/dispatcher.c b/dlls/secur32/dispatcher.c index 66f9c6f..367aebc 100644 --- a/dlls/secur32/dispatcher.c +++ b/dlls/secur32/dispatcher.c @@ -290,11 +290,11 @@ void check_version(PNegoHelper helper) temp[len] = 0; TRACE("Exact version is %s\n", debugstr_a(temp)); - if(strncmp(temp+8, "3.9", 3) == 0) + if(strncmp(temp+8, "4", 1) == 0) { helper->version = 4; } - else if(strncmp(temp+8, "3.0", 3) == 0) + else if(strncmp(temp+8, "3", 1) == 0) { helper->version = 3; }

1 0

Juan Lang : crypt32: Tighten CertDuplicateCertificateContext test.
by Alexandre Julliard 16 Mar '06

16 Mar '06

Module: wine Branch: refs/heads/master Commit: b40a406dc37ea7e7188a705454fd81e89b095f87 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b40a406dc37ea7e7188a705… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Mar 15 09:58:59 2006 -0800 crypt32: Tighten CertDuplicateCertificateContext test. Test that the return from CertDuplicateCertificateContext is the same as its parameter. --- dlls/crypt32/tests/store.c | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 2ca59b8..c147afb 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -143,17 +143,11 @@ static void testDupCert(void) dupContext = CertDuplicateCertificateContext(context); ok(dupContext != NULL, "Expected valid duplicate\n"); - if (dupContext) - { - ok(dupContext->cbCertEncoded == sizeof(bigCert), - "Expected cert of %d bytes, got %ld\n", sizeof(bigCert), - dupContext->cbCertEncoded); - ok(!memcmp(dupContext->pbCertEncoded, bigCert, - sizeof(bigCert)), - "Unexpected encoded cert in context\n"); - ok(dupContext->hCertStore == store, "Unexpected store\n"); - CertFreeCertificateContext(dupContext); - } + /* Not only is it a duplicate, it's identical: the address is the + * same. + */ + ok(dupContext == context, "Expected identical context addresses\n"); + CertFreeCertificateContext(dupContext); CertFreeCertificateContext(context); } CertCloseStore(store, 0);

1 0

lostwages/ include/winehq.conf wwn/wn20060313_ ...
by WineHQ 15 Mar '06

15 Mar '06

ChangeSet ID: 23587 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/03/15 16:26:56 Modified files: include : winehq.conf wwn : wn20060313_308.xml Added files: news : 2006031501.xml Log message: News about Wine 0.9.10 Patch: http://cvs.winehq.org/patch.py?id=23587 Old revision New revision Changes Path 1.33 1.34 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2006031501.xml 1.1 1.2 +1 -1 lostwages/wwn/wn20060313_308.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.33 lostwages/include/winehq.conf:1.34 --- lostwages/include/winehq.conf:1.33 15 Mar 2006 22:26:56 -0000 +++ lostwages/include/winehq.conf 15 Mar 2006 22:26:56 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.9 +snapshot_date: 0.9.10 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 Index: lostwages/news/2006031501.xml diff -u -p /dev/null lostwages/news/2006031501.xml:1.1 --- /dev/null 15 Mar 2006 22:26:56 -0000 +++ lostwages/news/2006031501.xml 15 Mar 2006 22:26:56 -0000 @@ -0,0 +1,22 @@ +<news> + <date>March 15, 2006</date> + <title>Wine 0.9.10 Released</title> + <body> + +Wine 0.9.10 was released yesterday. In it you'll find: +<ul> + <li>Improved ESD audio driver.</li> + <li>More Web browser improvements in mshtml and wininet.</li> + <li>Direct3D fixes and preparation for ddraw code migration.</li> + <li>Explorer process now managing the desktop window.</li> +</ul> + + Binary packages are in the process of being built, but the source is + <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.10.tar.bz2">available + now</a>. You can find out more about this release in the + <a href="?announce=1.114">announcement</a>. Check out our + <a href="/site/download">download page</a> for packages for your favorite + distribution. + + </body> +</news> Index: lostwages/wwn/wn20060313_308.xml diff -u -p lostwages/wwn/wn20060313_308.xml:1.1 lostwages/wwn/wn20060313_308.xml:1.2 --- lostwages/wwn/wn20060313_308.xml:1.1 15 Mar 2006 22:26:56 -0000 +++ lostwages/wwn/wn20060313_308.xml 15 Mar 2006 22:26:56 -0000 @@ -187,7 +187,7 @@ back to Wine.) Right now that appears t with development being done behind closed doors can lead to wasteful duplication. -Even after the problem Jeremy mentioned are solved, there's likely to +Even after the problems Jeremy mentioned are solved, there's likely to be some integration issues. One problem that gets mentioned quite a bit concerns what kind of display driver to use. OSX doesn't install X Windows by default, so it would be nice to have a native Quartz display driver.

1 0

Tag wine-0.9.10 : Alexandre Julliard : Release 0.9.10
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/tags/wine-0.9.10 Tag: 2f2f57b487be47ae45c89befb347aa7775e4f9eb URL: http://source.winehq.org/git/?p=wine.git;a=tag;h=2f2f57b487be47ae45c89befb3… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 15 15:46:46 2006 +0100 Release 0.9.10

1 0

Alexandre Julliard : Release 0.9.10.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: 832dd3c749d808ecbb9fa6310bccbb40919f9dca URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=832dd3c749d808ecbb9fa63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 15 15:41:07 2006 +0100 Release 0.9.10. --- ANNOUNCE | 17 - ChangeLog | 1012 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 configure | 18 + 4 files changed, 1029 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=832dd3c749d808ecbb9…

1 0

Alexandre Julliard : avitools: Fixed library path for msvfw32.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: 9af38dfbc75fe845ec49ea673a26bb932ee6757a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9af38dfbc75fe845ec49ea6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 15 15:24:05 2006 +0100 avitools: Fixed library path for msvfw32. --- programs/avitools/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/avitools/Makefile.in b/programs/avitools/Makefile.in index 0f44b4d..06cd46a 100644 --- a/programs/avitools/Makefile.in +++ b/programs/avitools/Makefile.in @@ -25,7 +25,7 @@ aviplay.exe.so: aviplay.o $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mwindows -o $@ aviplay.o -L$(DLLDIR)/avifil32 -L$(DLLDIR)/ddraw -L$(DLLDIR) -lavifil32 -lddraw -lkernel32 $(ALL_LIBS) icinfo.exe.so: icinfo.o - $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mwindows -o $@ icinfo.o -L$(DLLDIR) -lmsvfw32 -lkernel32 $(ALL_LIBS) + $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mwindows -o $@ icinfo.o -L$(DLLDIR)/msvfw32 -L$(DLLDIR) -lmsvfw32 -lkernel32 $(ALL_LIBS) aviinfo.exe: aviinfo.o $(CC) -o $@ aviinfo.o -lavifil32 $(ALL_LIBS)

1 0

Alexandre Julliard : user/tests: Try harder to flush X events before running tests.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: d8568e90be825d63cf53928db19187592d884050 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d8568e90be825d63cf53928… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 15 12:11:02 2006 +0100 user/tests: Try harder to flush X events before running tests. --- dlls/user/tests/msg.c | 29 ++++++++++++++++++++--------- dlls/user/tests/win.c | 16 ++++++++++++++++ 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/dlls/user/tests/msg.c b/dlls/user/tests/msg.c index 5b3cac5..b11ed2f 100644 --- a/dlls/user/tests/msg.c +++ b/dlls/user/tests/msg.c @@ -1282,6 +1282,21 @@ static void add_message(const struct mes sequence_cnt++; } +/* try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + MSG msg; + int diff = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + MsgWaitForMultipleObjects( 0, NULL, FALSE, diff, QS_ALLINPUT ); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + diff = time - GetTickCount(); + } +} + static void flush_sequence(void) { HeapFree(GetProcessHeap(), 0, sequence); @@ -3938,10 +3953,7 @@ static void test_paint_messages(void) ShowWindow( hwnd, SW_SHOW ); UpdateWindow( hwnd ); - - /* try to flush pending X expose events */ - MsgWaitForMultipleObjects( 0, NULL, FALSE, 100, QS_ALLINPUT ); - while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + flush_events(); check_update_rgn( hwnd, 0 ); SetRectRgn( hrgn, 10, 10, 20, 20 ); @@ -4142,10 +4154,7 @@ static void test_paint_messages(void) ShowWindow( hparent, SW_SHOW ); UpdateWindow( hparent ); UpdateWindow( hchild ); - /* try to flush pending X expose events */ - MsgWaitForMultipleObjects( 0, NULL, FALSE, 100, QS_ALLINPUT ); - while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); - + flush_events(); flush_sequence(); log_all_parent_messages++; @@ -4702,6 +4711,7 @@ static void test_accelerators(void) assert(hwnd != 0); UpdateWindow(hwnd); + flush_events(); SetFocus(hwnd); ok(GetFocus() == hwnd, "wrong focus window %p\n", GetFocus()); @@ -6171,7 +6181,7 @@ static void test_scrollwindowex(void) 10, 10, 150, 150, hwnd, 0, 0, NULL); ok (hchild != 0, "Failed to create child\n"); UpdateWindow(hwnd); - while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + flush_events(); flush_sequence(); /* scroll without the child window */ @@ -6424,6 +6434,7 @@ static void test_DispatchMessage(void) if (++count > 10) break; } } + DestroyWindow(hwnd); } diff --git a/dlls/user/tests/win.c b/dlls/user/tests/win.c index d4045b1..326a279 100644 --- a/dlls/user/tests/win.c +++ b/dlls/user/tests/win.c @@ -60,6 +60,21 @@ static HMENU hmenu; #define COUNTOF(arr) (sizeof(arr)/sizeof(arr[0])) +/* try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + MSG msg; + int diff = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + MsgWaitForMultipleObjects( 0, NULL, FALSE, diff, QS_ALLINPUT ); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + diff = time - GetTickCount(); + } +} + /* check the values returned by the various parent/owner functions on a given window */ static void check_parents( HWND hwnd, HWND ga_parent, HWND gwl_parent, HWND get_parent, HWND gw_owner, HWND ga_root, HWND ga_root_owner ) @@ -3423,6 +3438,7 @@ static void test_csparentdc(void) ShowWindow(hwndMain, SW_SHOW); ShowWindow(hwnd1, SW_SHOW); ShowWindow(hwnd2, SW_SHOW); + flush_events(); zero_parentdc_test(&test_answer); InvalidateRect(hwndMain, NULL, TRUE);

1 0

András Kovács : wininet: Added Hungarian translation.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: a2a4029e40f9d5ee0511a68637f9b7aba88ba9de URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a2a4029e40f9d5ee0511a68… Author: András Kovács <andras(a)csevego.net> Date: Mon Mar 6 12:47:11 2006 +0100 wininet: Added Hungarian translation. --- dlls/wininet/rsrc.rc | 1 + dlls/wininet/wininet_Hu.rc | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) create mode 100644 dlls/wininet/wininet_Hu.rc diff --git a/dlls/wininet/rsrc.rc b/dlls/wininet/rsrc.rc index 2ac54eb..cc4d106 100644 --- a/dlls/wininet/rsrc.rc +++ b/dlls/wininet/rsrc.rc @@ -47,6 +47,7 @@ #include "wininet_Es.rc" #include "wininet_Fi.rc" #include "wininet_Fr.rc" +#include "wininet_Hu.rc" #include "wininet_It.rc" #include "wininet_Ja.rc" #include "wininet_Ko.rc" diff --git a/dlls/wininet/wininet_Hu.rc b/dlls/wininet/wininet_Hu.rc new file mode 100644 index 0000000..5113549 --- /dev/null +++ b/dlls/wininet/wininet_Hu.rc @@ -0,0 +1,44 @@ +/* + * Copyright 2006 Andras Kovacs + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "H�l�zati jelsz� megad�sa" +FONT 8, "MS Shell Dlg" +{ + LTEXT "K�rem adja meg a felhaszn�l�nevet, �s jelsz�t:", -1, 40, 6, 150, 15 + LTEXT "Proxy", -1, 40, 26, 50, 10 + LTEXT "Csoport", -1, 40, 46, 50, 10 + LTEXT "Felhaszn�l�", -1, 40, 66, 50, 10 + LTEXT "Jelsz�", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Jelsz� ment�se (nem biztons�gos)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "M�gse", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ + IDS_LANCONNECTION "LAN kapcsolat" +}

1 0

András Kovács : wineps: Added Hungarian translation.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: dc2bceda7bcd1533a05c6ce25ce9439008c3ff30 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dc2bceda7bcd1533a05c6ce… Author: András Kovács <andras(a)csevego.net> Date: Mon Mar 6 12:47:11 2006 +0100 wineps: Added Hungarian translation. --- dlls/wineps/rsrc.rc | 1 + dlls/wineps/wps_Hu.rc | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 0 deletions(-) create mode 100644 dlls/wineps/wps_Hu.rc diff --git a/dlls/wineps/rsrc.rc b/dlls/wineps/rsrc.rc index 1b54c08..dd203f1 100644 --- a/dlls/wineps/rsrc.rc +++ b/dlls/wineps/rsrc.rc @@ -45,6 +45,7 @@ #include "wps_En.rc" #include "wps_Es.rc" #include "wps_Fr.rc" +#include "wps_Hu.rc" #include "wps_It.rc" #include "wps_Ja.rc" #include "wps_Ko.rc" diff --git a/dlls/wineps/wps_Hu.rc b/dlls/wineps/wps_Hu.rc new file mode 100644 index 0000000..c315db5 --- /dev/null +++ b/dlls/wineps/wps_Hu.rc @@ -0,0 +1,37 @@ +/* + * Copyright 2006 Andras Kovacs + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215 +STYLE WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE +CAPTION "Pap�r" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Pap�r &m�ret:", -1, 10, 6, 100, 8 + LISTBOX IDD_PAPERS, 10, 15, 200, 45, LBS_STANDARD | LBS_HASSTRINGS | + WS_TABSTOP + GROUPBOX "�r�sir�ny", -1, 10, 80, 200, 50 + CONTROL "&F�gg�leges", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | + WS_TABSTOP, 20, 90, 60, 10 + CONTROL "&V�zszintes", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON, + 20, 110, 60, 10 + LTEXT "Duplex:", IDD_DUPLEX_NAME, 10, 140, 100, 8 + COMBOBOX IDD_DUPLEX, 10, 151, 200, 20, CBS_DROPDOWNLIST | CBS_HASSTRINGS | + WS_TABSTOP +}

1 0

András Kovács : shlwapi: Added Hungarian translation.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: d1df8a85c1a0b5c53a935d655b2f642842272fa8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d1df8a85c1a0b5c53a935d6… Author: András Kovács <andras(a)csevego.net> Date: Mon Mar 6 12:47:11 2006 +0100 shlwapi: Added Hungarian translation. --- dlls/shlwapi/shlwapi.rc | 1 + dlls/shlwapi/shlwapi_Hu.rc | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) create mode 100644 dlls/shlwapi/shlwapi_Hu.rc diff --git a/dlls/shlwapi/shlwapi.rc b/dlls/shlwapi/shlwapi.rc index 8e219c2..b566177 100644 --- a/dlls/shlwapi/shlwapi.rc +++ b/dlls/shlwapi/shlwapi.rc @@ -29,6 +29,7 @@ #include "shlwapi_En.rc" #include "shlwapi_Es.rc" #include "shlwapi_Fi.rc" +#include "shlwapi_Hu.rc" #include "shlwapi_Ko.rc" #include "shlwapi_Nl.rc" #include "shlwapi_No.rc" diff --git a/dlls/shlwapi/shlwapi_Hu.rc b/dlls/shlwapi/shlwapi_Hu.rc new file mode 100644 index 0000000..78101e2 --- /dev/null +++ b/dlls/shlwapi/shlwapi_Hu.rc @@ -0,0 +1,35 @@ +/* + * Hungarian resources for shlwapi + * + * Copyright 2006 Andras Kovacs + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Hiba!" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 + LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 + CHECKBOX "Ne jelen�&tse meg ezt az �zenetet ism�t", 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"&M�gse" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Igen" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Nem" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP +}

1 0

András Kovács : shell32: Added Hungarian translation.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: 8ab92e8a06e126868a616a4807aa8ddbda3ea579 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8ab92e8a06e126868a616a4… Author: András Kovács <andras(a)csevego.net> Date: Mon Mar 6 12:47:11 2006 +0100 shell32: Added Hungarian translation. --- dlls/shell32/shell32_Hu.rc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shell32_Hu.rc b/dlls/shell32/shell32_Hu.rc index 62e9570..2ded4ea 100644 --- a/dlls/shell32/shell32_Hu.rc +++ b/dlls/shell32/shell32_Hu.rc @@ -1,5 +1,5 @@ /* - * Copyright 1998 Juergen Schmied + * Copyright 2006 Andras Kovacs * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,7 +20,7 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "A %s-r�l" +CAPTION "N�vjegy: %s" FONT 10, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP @@ -37,10 +37,10 @@ CAPTION "" FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and Wine will open it for you.", 12289, 36, 11, 182, 18 - LTEXT "&Open:", 12305, 7, 39, 24, 10 + LTEXT "�rja be a program, mappa, doumentum c�m�t, vagy internet er�forr�st, a Wine meg fogja �nnek nyitni.", 12289, 36, 11, 182, 18 + LTEXT "&Megnyit�s:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "&Browse...", 12288, 170, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "M�gse", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "&Tall�z�s...", 12288, 170, 63, 50, 14, WS_TABSTOP }

1 0

András Kovács : shdocvw: Added Hungarian translation.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: 841c12fa2f5ef9737192bd88ddc1b67ce894c6ea URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=841c12fa2f5ef9737192bd8… Author: András Kovács <andras(a)csevego.net> Date: Mon Mar 6 12:47:11 2006 +0100 shdocvw: Added Hungarian translation. --- dlls/shdocvw/Hu.rc | 36 ++++++++++++++++++++++++++++++++++++ dlls/shdocvw/shdocvw.rc | 1 + 2 files changed, 37 insertions(+), 0 deletions(-) create mode 100644 dlls/shdocvw/Hu.rc diff --git a/dlls/shdocvw/Hu.rc b/dlls/shdocvw/Hu.rc new file mode 100644 index 0000000..42b60b8 --- /dev/null +++ b/dlls/shdocvw/Hu.rc @@ -0,0 +1,36 @@ +/* + * Copyright 2006 Andras Kovacs + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Mozilla Active X vez�rl� let�lt�se" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 + LTEXT "", 104, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "M�gse", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE +BEGIN + 1001 "Ez az alkalmaz�s egy ActiveX b�ng�sz� objektumot k�r,\n" \ + "de a Mozilla Active X vez�rl� jelenleg nincs telep�tve." \ + "Szeretn� let�lteni, �s ut�na telep�teni?" +END diff --git a/dlls/shdocvw/shdocvw.rc b/dlls/shdocvw/shdocvw.rc index 0ab4668..d27991b 100644 --- a/dlls/shdocvw/shdocvw.rc +++ b/dlls/shdocvw/shdocvw.rc @@ -29,6 +29,7 @@ #include "Es.rc" #include "Fi.rc" #include "Fr.rc" +#include "Hu.rc" #include "Ko.rc" #include "Nl.rc" #include "No.rc"

1 0

András Kovács : setupapi: Added Hungarian translation.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: 09aa66879dbfdaf04cc2012c705ad78df1dc87dd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=09aa66879dbfdaf04cc2012… Author: András Kovács <andras(a)csevego.net> Date: Mon Mar 6 12:47:11 2006 +0100 setupapi: Added Hungarian translation. --- dlls/setupapi/Hu.rc | 34 ++++++++++++++++++++++++++++++++++ dlls/setupapi/setupapi.rc | 1 + 2 files changed, 35 insertions(+), 0 deletions(-) create mode 100644 dlls/setupapi/Hu.rc diff --git a/dlls/setupapi/Hu.rc b/dlls/setupapi/Hu.rc new file mode 100644 index 0000000..632a368 --- /dev/null +++ b/dlls/setupapi/Hu.rc @@ -0,0 +1,34 @@ +/* + * Hungarian resources for SETUPAPI + * + * Copyright 2006 Andras Kovacs + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "F�jlok m�sol�sa..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "M�gse", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Forr�s:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "C�l:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END diff --git a/dlls/setupapi/setupapi.rc b/dlls/setupapi/setupapi.rc index faeb43a..615f9db 100644 --- a/dlls/setupapi/setupapi.rc +++ b/dlls/setupapi/setupapi.rc @@ -31,6 +31,7 @@ #include "Es.rc" #include "Fi.rc" #include "Fr.rc" +#include "Hu.rc" #include "It.rc" #include "Ja.rc" #include "Ko.rc"

1 0

András Kovács : serialui: Added Hungarian translation.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: ed42a4c42699ed3a8eeee14e821a99d58a8428d4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ed42a4c42699ed3a8eeee14… Author: András Kovács <andras(a)csevego.net> Date: Mon Mar 6 12:47:11 2006 +0100 serialui: Added Hungarian translation. --- dlls/serialui/Hu.rc | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/serialui/serialui_rc.rc | 1 + 2 files changed, 42 insertions(+), 0 deletions(-) create mode 100644 dlls/serialui/Hu.rc diff --git a/dlls/serialui/Hu.rc b/dlls/serialui/Hu.rc new file mode 100644 index 0000000..5640bff --- /dev/null +++ b/dlls/serialui/Hu.rc @@ -0,0 +1,41 @@ +/* + * Copyright 2006 Andras Kovacs + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Tulajdons�gok: " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Baud R�ta", 0,5,20,55,10 + COMBOBOX IDC_BAUD, 60, 20, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Parit�s", 0,5,40,55,10 + COMBOBOX IDC_PARITY, 60, 40, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "�raml�s-vez�rl�s", 0,5,60,55,10 + COMBOBOX IDC_FLOW, 60, 60, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Adatbitek", 0,5,80,55,10 + COMBOBOX IDC_DATA, 60, 80, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Stopbitek", 0,5,100,55,10 + COMBOBOX IDC_STOP, 60, 100, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK,30,138,50,14 + PUSHBUTTON "M�gse", IDCANCEL,85,138,50,14 + /* these two buttons are for testing Get/SetDefaultCommConfig */ + /* PUSHBUTTON "GetDefault", ID_GETDEFAULT,30,115,50,14 */ + /* PUSHBUTTON "SetDefault", ID_SETDEFAULT,85,115,50,14 */ +END diff --git a/dlls/serialui/serialui_rc.rc b/dlls/serialui/serialui_rc.rc index 28beecc..5ba59f0 100644 --- a/dlls/serialui/serialui_rc.rc +++ b/dlls/serialui/serialui_rc.rc @@ -28,6 +28,7 @@ #include "Es.rc" #include "Fi.rc" #include "Fr.rc" +#include "Hu.rc" #include "It.rc" #include "Ja.rc" #include "Ko.rc"

1 0

András Kovács : oledlg: Added Hungarian translation.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: b888034d629e4c40b7c250468193927eadbc5b38 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b888034d629e4c40b7c2504… Author: András Kovács <andras(a)csevego.net> Date: Mon Mar 6 12:47:11 2006 +0100 oledlg: Added Hungarian translation. --- dlls/oledlg/oledlg_Hu.rc | 55 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/oledlg/rsrc.rc | 1 + 2 files changed, 56 insertions(+), 0 deletions(-) create mode 100644 dlls/oledlg/oledlg_Hu.rc diff --git a/dlls/oledlg/oledlg_Hu.rc b/dlls/oledlg/oledlg_Hu.rc new file mode 100644 index 0000000..1d2b854 --- /dev/null +++ b/dlls/oledlg/oledlg_Hu.rc @@ -0,0 +1,55 @@ +/* + * Copyright 2006 Andras Kovacs + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Objektum besz�r�sa" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | + LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | + WS_TABSTOP + LTEXT "Obktum t�pus:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + DEFPUSHBUTTON "OK",IDOK,221,7,66,14 + PUSHBUTTON "M�gse",IDCANCEL,221,24,66,14 + GROUPBOX "Eredm�ny",IDC_RESULT,7,103,208,41 + CONTROL "�j l�trehoz�sa",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,7,20,62,10 + CONTROL "Vez�rl� l�trehoz�sa",IDC_CREATECONTROL,"Button", + BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 + CONTROL "L�trehoz�s f�jlb�l",IDC_CREATEFROMFILE,"Button", + BS_AUTORADIOBUTTON,7,37,67,10 + LTEXT "",IDC_RESULTDESC,49,112,159,23 + PUSHBUTTON "Vez�rl� hozz�&ad�sa...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + CONTROL "Megjelen�t�s ikonk�nt",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 + PUSHBUTTON "Tall�z...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "F�jl:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_RESULTOBJDESC "�j %s objektum behelyez�se az �n dokumentum�ba" + IDS_RESULTFILEOBJDESC "K�rem illesssze be a f�jl tartalm�t, mint objektumot a dokumentum�ba, azzal a programmal amivel l�trehozta." + IDS_BROWSE "Tall�z�s" + IDS_NOTOLEMOD "A f�jl �gy t�nik nem egy �rv�nyes OLE modul. Nem tudom regisztr�lni az OLE vez�rl�t." + IDS_NOTOLEMODCAPTION "Vez�rl� hozz�ad�sa" +} diff --git a/dlls/oledlg/rsrc.rc b/dlls/oledlg/rsrc.rc index 614a563..ea14a82 100644 --- a/dlls/oledlg/rsrc.rc +++ b/dlls/oledlg/rsrc.rc @@ -36,6 +36,7 @@ #include "oledlg_En.rc" #include "oledlg_Es.rc" #include "oledlg_Fr.rc" +#include "oledlg_Hu.rc" #include "oledlg_It.rc" #include "oledlg_Ja.rc" #include "oledlg_Ko.rc"

1 0

András Kovács : msvidc32: Added Hungarian translation.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: 7ad51eab0bc9c109f7deff02d6ab3c86426755e5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7ad51eab0bc9c109f7deff0… Author: András Kovács <andras(a)csevego.net> Date: Mon Mar 6 12:47:11 2006 +0100 msvidc32: Added Hungarian translation. --- dlls/msvidc32/msvidc32_Hu.rc | 25 +++++++++++++++++++++++++ dlls/msvidc32/rsrc.rc | 1 + 2 files changed, 26 insertions(+), 0 deletions(-) create mode 100644 dlls/msvidc32/msvidc32_Hu.rc diff --git a/dlls/msvidc32/msvidc32_Hu.rc b/dlls/msvidc32/msvidc32_Hu.rc new file mode 100644 index 0000000..aedb766 --- /dev/null +++ b/dlls/msvidc32/msvidc32_Hu.rc @@ -0,0 +1,25 @@ +/* + * Copyright 2006 Andras Kovacs + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "WINE-MS-CRAM" + IDS_DESCRIPTION "Wine Video 1 video kodek" +} diff --git a/dlls/msvidc32/rsrc.rc b/dlls/msvidc32/rsrc.rc index faf9221..4106294 100644 --- a/dlls/msvidc32/rsrc.rc +++ b/dlls/msvidc32/rsrc.rc @@ -21,6 +21,7 @@ #include "msvidc32_De.rc" #include "msvidc32_En.rc" +#include "msvidc32_Hu.rc" #include "msvidc32_Ko.rc" #include "msvidc32_No.rc" #include "msvidc32_Tr.rc"

1 0

András Kovács : msvfw32: Added Hungarian translation.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: 3295589151fbbd4ab080bb0abd854e109f392a94 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3295589151fbbd4ab080bb0… Author: András Kovács <andras(a)csevego.net> Date: Mon Mar 6 12:47:11 2006 +0100 msvfw32: Added Hungarian translation. --- dlls/msvfw32/msvfw32_Hu.rc | 51 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvfw32/rsrc.rc | 1 + 2 files changed, 52 insertions(+), 0 deletions(-) create mode 100644 dlls/msvfw32/msvfw32_Hu.rc diff --git a/dlls/msvfw32/msvfw32_Hu.rc b/dlls/msvfw32/msvfw32_Hu.rc new file mode 100644 index 0000000..1f1e88e --- /dev/null +++ b/dlls/msvfw32/msvfw32_Hu.rc @@ -0,0 +1,51 @@ +/* + * Copyright 2006 Andras Kovacs + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Video t�m�r�t�s" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK",IDOK,129,2,49,14 + PUSHBUTTON "M�gse",IDCANCEL,129,18,49,14 + + LTEXT "&T�m�r�t�:",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "Be�ll�&t�s...",882,129,36,49,14 + PUSHBUTTON "&About...",883,129,52,49,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "T�m�r�t�si min�s�&g:",886,9,34,80,8 + + CONTROL "&Kulcs k�pkocka minden",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "k�pkock�nk�nt",889,103,62,26,10 + + CONTROL "A&dat ar�ny",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "KB/sec",896,102,78,26,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "Teljes k�pkock�k (t�m�r�tetlen)" +} diff --git a/dlls/msvfw32/rsrc.rc b/dlls/msvfw32/rsrc.rc index a1ae285..579019e 100644 --- a/dlls/msvfw32/rsrc.rc +++ b/dlls/msvfw32/rsrc.rc @@ -22,6 +22,7 @@ #include "msvfw32_De.rc" #include "msvfw32_En.rc" +#include "msvfw32_Hu.rc" #include "msvfw32_Ko.rc" #include "msvfw32_No.rc" #include "msvfw32_Tr.rc"

1 0

András Kovács : msrle32: Added Hungarian translation.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: 359a9dc073899644c0b21ef0ef7a10ca55e77ab9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=359a9dc073899644c0b21ef… Author: András Kovács <andras(a)csevego.net> Date: Mon Mar 6 12:47:11 2006 +0100 msrle32: Added Hungarian translation. --- dlls/msrle32/msrle_Hu.rc | 28 ++++++++++++++++++++++++++++ dlls/msrle32/rsrc.rc | 1 + 2 files changed, 29 insertions(+), 0 deletions(-) create mode 100644 dlls/msrle32/msrle_Hu.rc diff --git a/dlls/msrle32/msrle_Hu.rc b/dlls/msrle32/msrle_Hu.rc new file mode 100644 index 0000000..cb64106 --- /dev/null +++ b/dlls/msrle32/msrle_Hu.rc @@ -0,0 +1,28 @@ +/* + * Hungarian resource file for MS-RLE + * + * Copyright 2006 Andras Kovacs + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "WINE-MS-RLE" + IDS_DESCRIPTION "Wine MS-RLE video kodek" + IDS_ABOUT "Wine MS-RLE video kodek\nCopyright 2002, Michael Gnnewig" +} diff --git a/dlls/msrle32/rsrc.rc b/dlls/msrle32/rsrc.rc index 9079d6c..a17747f 100644 --- a/dlls/msrle32/rsrc.rc +++ b/dlls/msrle32/rsrc.rc @@ -37,6 +37,7 @@ #include "msrle_En.rc" #include "msrle_Es.rc" #include "msrle_Fr.rc" +#include "msrle_Hu.rc" #include "msrle_It.rc" #include "msrle_Ja.rc" #include "msrle_Ko.rc"

1 0

András Kovács : msi: Added Hungarian translation.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: fb7921a1d36e37b95d81210a310ca5e0ce740ef7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fb7921a1d36e37b95d81210… Author: András Kovács <andras(a)csevego.net> Date: Mon Mar 6 12:47:11 2006 +0100 msi: Added Hungarian translation. --- dlls/msi/msi.rc | 1 + dlls/msi/msi_Hu.rc | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) create mode 100644 dlls/msi/msi_Hu.rc diff --git a/dlls/msi/msi.rc b/dlls/msi/msi.rc index 2bacb82..5895e55 100644 --- a/dlls/msi/msi.rc +++ b/dlls/msi/msi.rc @@ -33,6 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "msi_Es.rc" #include "msi_Fi.rc" #include "msi_Fr.rc" +#include "msi_Hu.rc" #include "msi_Ko.rc" #include "msi_Nl.rc" #include "msi_No.rc" diff --git a/dlls/msi/msi_Hu.rc b/dlls/msi/msi_Hu.rc new file mode 100644 index 0000000..9f76ef1 --- /dev/null +++ b/dlls/msi/msi_Hu.rc @@ -0,0 +1,33 @@ +/* + * Hungarian resources for MSI + * + * Copyright 2006 Andras Kovacs + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + 5 "%s �tvonal nem tal�lhat�" + 9 "helyezze be a lemezt: %s" + 10 "rossz param�terek" + 11 "adja meg melyik mappa tartalmazza ezt: %s" + 12 "hi�nyz� tulajdons�g a telep�t�si forr�shoz" + 13 "hi�nyz� tulajdons�g a h�l�zati meghajt�hoz" + 14 "tulajdons�g innen:" + 15 "v�lassza ki, melyik mappa tartalmazza ezt: %s" +}

1 0

András Kovács : mshtml: Added Hungarian translation.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: 724f35419b7cc071159e8cb35da7c88e2548f977 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=724f35419b7cc071159e8cb… Author: András Kovács <andras(a)csevego.net> Date: Mon Mar 6 12:47:11 2006 +0100 mshtml: Added Hungarian translation. --- dlls/mshtml/Hu.rc | 245 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/rsrc.rc | 1 2 files changed, 246 insertions(+), 0 deletions(-) create mode 100644 dlls/mshtml/Hu.rc diff --git a/dlls/mshtml/Hu.rc b/dlls/mshtml/Hu.rc new file mode 100644 index 0000000..4cb1aeb --- /dev/null +++ b/dlls/mshtml/Hu.rc @@ -0,0 +1,245 @@ +/* + * Copyright 2006 Andras Kovacs + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_HTMLDISABLED "A HTML rajzol�s jelenleg le van tiltva." + IDS_HTMLDOCUMENT "HTML Dokumentum" +} + +/* FIXME: This should be in shdoclc.dll */ + +IDR_BROWSE_CONTEXT_MENU MENU +{ + POPUP "Default" + { + MENUITEM "&Vissza", IDM_BACK + MENUITEM "El&�re", IDM_FORWARD + MENUITEM SEPARATOR + MENUITEM "&H�tt�r ment�se...", IDM_SAVEBACKGROUNDAS + MENUITEM "Be�ll�t�s h�&tt�rk�nt", IDM_SETASBACKGROUND + MENUITEM "H�tt�r &m�sol�sa", IDM_COPYBACKGROUND + MENUITEM "Be�ll�t�s &asztalelemk�nt", IDM_SETASDESKTOPITEM + MENUITEM SEPARATOR + MENUITEM "M&indet kijel�li", IDM_SELECTALL + MENUITEM "&Beilleszt�s", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "Parancsi&kon l�trehoz�sa", IDM_CREATESHORTCUT + MENUITEM "Hozz�a&d�s a kedvencekhez", IDM_ADDTOFAVOURITES + MENUITEM "&Forr�s megjelen�t�se", IDM_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "K&�dol�s", IDM_ENCODING + MENUITEM SEPARATOR + MENUITEM "&Nyomtat�s", IDM_PRINT + MENUITEM "F&riss�t�s", IDM_REFRESH + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "Tula&jdons�gok", IDM_PROPERTIES + } + + POPUP "Image" + { + MENUITEM "&Link megnyit�sa", IDM_OPENLINK + MENUITEM "Li&nk megnyit�sa �j ablakban", IDM_OPENINNEWWINDOW + MENUITEM "C�l ment&�se...", IDM_SAVETARGETAS + MENUITEM "&C�l nyomtat�sa", IDM_PRINTTARGET + MENUITEM SEPARATOR + MENUITEM "K�p megjelen&�t�se", IDM_SHOWPICTURE + MENUITEM "&K�p ment�se...", IDM_SAVEPICTUREAS + MENUITEM "K�p elk�ld�se &e-mail-ben...", IDM_EMAILPICTURE + MENUITEM "K�p n&yomtat�sa...", IDM_PRINTPICTURE + MENUITEM "&Ugr�s a K�pek-hez", IDM_GOTOMYPICTURES + MENUITEM "Be�ll�tt�s h�&tt�rk�nt", IDM_SETASBACKGROUND + MENUITEM "Be�ll�tt�s &asztalelemk�nt...", IDM_SETASDESKTOPITEM + MENUITEM SEPARATOR + MENUITEM "K&iv�g�s", IDM_CUT + MENUITEM "&M�sol�s", IDM_COPY + MENUITEM "Parancs&ikon m�sol�sa", IDM_COPYSHORTCUT + MENUITEM "Bei&lleszt�s", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "Hozz�a&d�s a kedvencekhez...", IDM_ADDTOFAVOURITES + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "Tula&jdons�gok", IDM_PROPERTIES + } + + POPUP "Control" + { + MENUITEM "&Visszavon�s", IDM_UNDO + MENUITEM SEPARATOR + MENUITEM "Kiv&�g�s", IDM_CUT + MENUITEM "&M�sol�s", IDM_COPY + MENUITEM "&Beilleszt�s", IDM_PASTE + MENUITEM "&T�rl�s", IDM_DELETE + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "Mindet k&ijel�li", IDM_SELECTALL + } + + POPUP "Table" + { + POPUP "&Kiv�laszt�s" + { + MENUITEM "&Cella", IDM_CELL + MENUITEM "&Sor", IDM_ROW + MENUITEM "&Oszlop", IDM_COLUMN + MENUITEM "&T�bla", IDM_TABLE + } + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "&Cella tulajdons�gai", IDM_CELLPROPERTIES + MENUITEM "&T�bla tulajdons�gai", IDM_TABLEPROPERTIES + } + + POPUP "1DSite Select" + { + MENUITEM "&Kiv�g�s", IDM_CUT + MENUITEM "&M�sol�s", IDM_COPY + MENUITEM "Beilleszt�s", IDM_PASTE + MENUITEM "Mindet k&ijel�li", IDM_SELECTALL + MENUITEM "&Nyomtat�s", IDM_PRINT + MENUITEM SEPARATOR + } + + POPUP "Anchor" + { + MENUITEM "&Megnyit�s", IDM_OPENLINK + MENUITEM "Megnyit�s &�j ablakban", IDM_OPENINNEWWINDOW + MENUITEM "C�l m&ent�se...", IDM_SAVETARGETAS + MENUITEM "C&�l nyomtat�sa", IDM_PRINTTARGET + MENUITEM SEPARATOR + MENUITEM "Kiv�g�s", IDM_CUT + MENUITEM "M�&sol�s", IDM_COPY + MENUITEM "Parancs&ikon m�sol�sa", IDM_COPYSHORTCUT + MENUITEM "&Beilleszt�s", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "Hozz�ad�s a ke&dvencekhez...", IDM_ADDTOFAVOURITES + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "Tula&jdons�gok", IDM_PROPERTIES + } + + POPUP "Context Unknown" + { + MENUITEM SEPARATOR + } + + + POPUP "DYNSRC Image" + { + MENUITEM "&Link megnyit�sa", IDM_OPENLINK + MENUITEM "Li&nk megnyit�sa �j ablakban", IDM_OPENINNEWWINDOW + MENUITEM "C�l ment&�se...", IDM_SAVETARGETAS + MENUITEM "&C�l nyomtat�sa", IDM_PRINTTARGET + MENUITEM SEPARATOR + MENUITEM "K�p megjelen&�t�se", IDM_SHOWPICTURE + MENUITEM "&Video ment�se...", IDM_SAVEPICTUREAS + MENUITEM "Be�ll�tt�s h�&tt�rk�nt", IDM_SETASBACKGROUND + MENUITEM "Be�ll�tt�s &asztalelemk�nt...", IDM_SETASDESKTOPITEM + MENUITEM SEPARATOR + MENUITEM "K&iv�g�s", IDM_CUT + MENUITEM "&M�sol�s", IDM_COPY + MENUITEM "Parancs&ikon m�sol�sa", IDM_COPYSHORTCUT + MENUITEM "Bei&lleszt�s", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "Hozz�a&d�s a kedvencekhez...", IDM_ADDTOFAVOURITES + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "Lej�tsz�s", IDM_PLAY + MENUITEM "Le�ll�t�s", IDM_STOP + MENUITEM "Tula&jdons�gok", IDM_PROPERTIES + } + + POPUP "ART Image" + { + MENUITEM "&Link megnyit�sa", IDM_OPENLINK + MENUITEM "Li&nk megnyit�sa �j ablakban", IDM_OPENINNEWWINDOW + MENUITEM "C�l ment&�se...", IDM_SAVETARGETAS + MENUITEM "&C�l nyomtat�sa", IDM_PRINTTARGET + MENUITEM SEPARATOR + MENUITEM "K�p megjelen&�t�se", IDM_SHOWPICTURE + MENUITEM "&Video ment�se...", IDM_SAVEPICTUREAS + MENUITEM "Be�ll�tt�s h�&tt�rk�nt", IDM_SETASBACKGROUND + MENUITEM "Be�ll�tt�s &asztalelemk�nt...", IDM_SETASDESKTOPITEM + MENUITEM SEPARATOR + MENUITEM "K&iv�g�s", IDM_CUT + MENUITEM "&M�sol�s", IDM_COPY + MENUITEM "Parancs&ikon m�sol�sa", IDM_COPYSHORTCUT + MENUITEM "Bei&lleszt�s", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "Hozz�a&d�s a kedvencekhez...", IDM_ADDTOFAVOURITES + MENUITEM SEPARATOR + MENUITEM "Lej�tsz�s", IDM_PLAY + MENUITEM "Le�ll�t�s", IDM_STOP + MENUITEM "Visszateker�s", IDM_REWIND + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "Tula&jdons�gok", IDM_PROPERTIES + } + + POPUP "Debug" + { + MENUITEM "Trace Tag-ek", IDM_TRACETAGS + MENUITEM "Er�forr�s hib�k", IDM_RESOURCEFAILURES + MENUITEM "Nyomk�vet�si info dumpl�sa", IDM_DUMPTRACKINGINFO + MENUITEM "Hibakeres�s megszak�t�sa", IDM_DEBUGBREAK + MENUITEM "Hibakeres�si n�zet", IDM_DEBUGVIEW + MENUITEM "Fa dumpol�sa", IDM_DUMPTREE + MENUITEM "Sorok dumpol�sa", IDM_DUMPLINES + MENUITEM "DisplayTree dumpol�sa", IDM_DUMPDISPLAYTREE + MENUITEM "FormatCaches dumpol�sa", IDM_DUMPFORMATCACHES + MENUITEM "LayoutRects dumpol�sa", IDM_DUMPLAYOUTRECTS + MENUITEM "Mem�riafigyel�", IDM_MEMORYMONITOR + MENUITEM "Teljes�tm�nym�r�", IDM_PERFORMANCEMETERS + MENUITEM "HTML ment�se", IDM_SAVEHTML + MENUITEM SEPARATOR + MENUITEM "&N�zet tall�z�sa", IDM_BROWSEVIEW + MENUITEM "N&�zet szerkeszt�se", IDM_EDITVIEW + } + + POPUP "Vertical Scrollbar" + { + MENUITEM "G�rget�s itt", IDM_SCROLLHERE + MENUITEM SEPARATOR + MENUITEM "Fel�l", IDM_TOP + MENUITEM "Alul", IDM_BOTTOM + MENUITEM SEPARATOR + MENUITEM "Lap fel", IDM_PAGEUP + MENUITEM "Lap le", IDM_PAGEDOWN + MENUITEM SEPARATOR + MENUITEM "G�rget�s fel", IDM_SCROLLUP + MENUITEM "G�rget�s le", IDM_SCROLLDOWN + } + + POPUP "Horizontal Scrollbar" + { + MENUITEM "G�rget�s itt", IDM_SCROLLHERE + MENUITEM SEPARATOR + MENUITEM "Bal sz�le", IDM_LEFTEDGE + MENUITEM "Jobb sz�le", IDM_RIGHTEDGE + MENUITEM SEPARATOR + MENUITEM "Lap balra", IDM_PAGELEFT + MENUITEM "Lap jobbra", IDM_PAGERIGHT + MENUITEM SEPARATOR + MENUITEM "G�rget�s balra", IDM_SCROLLLEFT + MENUITEM "G�rget�s jobbra", IDM_SCROLLRIGHT + } +} diff --git a/dlls/mshtml/rsrc.rc b/dlls/mshtml/rsrc.rc index 86cbd53..7b1fc0f 100644 --- a/dlls/mshtml/rsrc.rc +++ b/dlls/mshtml/rsrc.rc @@ -26,6 +26,7 @@ #include "En.rc" #include "Fi.rc" #include "Fr.rc" +#include "Hu.rc" #include "Ko.rc" #include "Nl.rc" #include "No.rc"

1 0

András Kovács : msacm: Added Hungarian translation.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: 6f74cf82b3b519022620129eecaad06dc062f616 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6f74cf82b3b519022620129… Author: András Kovács <andras(a)csevego.net> Date: Mon Mar 6 12:47:11 2006 +0100 msacm: Added Hungarian translation. --- dlls/msacm/msacm.rc | 1 + dlls/msacm/msacm_Hu.rc | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 0 deletions(-) create mode 100644 dlls/msacm/msacm_Hu.rc diff --git a/dlls/msacm/msacm.rc b/dlls/msacm/msacm.rc index fb8535b..f929827 100644 --- a/dlls/msacm/msacm.rc +++ b/dlls/msacm/msacm.rc @@ -28,6 +28,7 @@ #include "msacm_En.rc" #include "msacm_Es.rc" #include "msacm_Fr.rc" +#include "msacm_Hu.rc" #include "msacm_It.rc" #include "msacm_Ja.rc" #include "msacm_Ko.rc" diff --git a/dlls/msacm/msacm_Hu.rc b/dlls/msacm/msacm_Hu.rc new file mode 100644 index 0000000..676193c --- /dev/null +++ b/dlls/msacm/msacm_Hu.rc @@ -0,0 +1,56 @@ +/* + * Hungarian resource file for MS ACM + * + * Copyright 2006 Andras Kovacs + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Hang kiv�laszt�s" +FONT 8, "MS Shell Dlg" +BEGIN + + LTEXT "&N�v:", -1, 5, 5, 115, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + PUSHBUTTON "&Ment�s m�sk�nt...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 + PUSHBUTTON "&Elt�vol�t�s", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + + LTEXT "&Form�tum:", -1, 5, 41, 44, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Attrib�tumok:", -1, 5, 59, 44, 8, NOT WS_GROUP + +#if 0 + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | + CBS_OWNERDRAWFIXED | CBS_HASSTRINGS +#else + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +#endif + DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 + PUSHBUTTON "M�gse", IDCANCEL, 92, 80, 40, 14 + PUSHBUTTON "&S�g�", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + +END

1 0

András Kovács : mpr: Added Hungarian translation.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: c8774d6abb547b37f1b3665b4ad2cb09bb7e39f9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c8774d6abb547b37f1b3665… Author: András Kovács <andras(a)csevego.net> Date: Mon Mar 6 12:47:11 2006 +0100 mpr: Added Hungarian translation. --- dlls/mpr/mpr.rc | 1 + dlls/mpr/mpr_Hu.rc | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 0 deletions(-) create mode 100644 dlls/mpr/mpr_Hu.rc diff --git a/dlls/mpr/mpr.rc b/dlls/mpr/mpr.rc index 5709e59..875bff2 100644 --- a/dlls/mpr/mpr.rc +++ b/dlls/mpr/mpr.rc @@ -30,6 +30,7 @@ #include "mpr_En.rc" #include "mpr_Es.rc" #include "mpr_Fr.rc" +#include "mpr_Hu.rc" #include "mpr_It.rc" #include "mpr_Ja.rc" #include "mpr_Ko.rc" diff --git a/dlls/mpr/mpr_Hu.rc b/dlls/mpr/mpr_Hu.rc new file mode 100644 index 0000000..4dbe62f --- /dev/null +++ b/dlls/mpr/mpr_Hu.rc @@ -0,0 +1,46 @@ +/* + * MPR dll resources + * + * Copyright (C) 2006 Andras Kovacs + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Teljes h�l�zat" +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "H�l�zati jelsz� megad�sa" +FONT 8, "MS Shell Dlg" +{ + LTEXT "K�rem adja meg a felhaszn�l�nev�t �s jelszav�t:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Proxy", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ + LTEXT "Felhaszn�l�n�v", -1, 40, 66, 50, 10 + LTEXT "Jelsz�", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Jelsz� ment�se (nem biztons�gos)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "M�gse", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +}

1 0

András Kovács : iccvid: Added Hungarian translation.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: 01b21ee1746b5b2514c5c9b859b27030cd9017f1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=01b21ee1746b5b2514c5c9b… Author: András Kovács <andras(a)csevego.net> Date: Mon Mar 6 12:47:11 2006 +0100 iccvid: Added Hungarian translation. --- dlls/iccvid/iccvid_Hu.rc | 25 +++++++++++++++++++++++++ dlls/iccvid/rsrc.rc | 1 + 2 files changed, 26 insertions(+), 0 deletions(-) create mode 100644 dlls/iccvid/iccvid_Hu.rc diff --git a/dlls/iccvid/iccvid_Hu.rc b/dlls/iccvid/iccvid_Hu.rc new file mode 100644 index 0000000..b54dfe7 --- /dev/null +++ b/dlls/iccvid/iccvid_Hu.rc @@ -0,0 +1,25 @@ +/* + * Copyright 2006 Andras Kovacs + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "Cinepak Video kodek" + IDS_DESCRIPTION "Cinepak Video kodek" +} diff --git a/dlls/iccvid/rsrc.rc b/dlls/iccvid/rsrc.rc index 6dbd568..08f606a 100644 --- a/dlls/iccvid/rsrc.rc +++ b/dlls/iccvid/rsrc.rc @@ -21,6 +21,7 @@ #include "iccvid_De.rc" #include "iccvid_En.rc" +#include "iccvid_Hu.rc" #include "iccvid_Ko.rc" #include "iccvid_No.rc" #include "iccvid_Tr.rc"

1 0

András Kovács : hhctrl.ocx: Added Hungarian translation.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: 6d9399ac70cac41343777c76c2a451f0ebb16223 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6d9399ac70cac41343777c7… Author: András Kovács <andras(a)csevego.net> Date: Mon Mar 6 12:47:11 2006 +0100 hhctrl.ocx: Added Hungarian translation. --- dlls/hhctrl.ocx/Hu.rc | 58 +++++++++++++++++++++++++++++++++++++++++++++ dlls/hhctrl.ocx/hhctrl.rc | 1 + 2 files changed, 59 insertions(+), 0 deletions(-) create mode 100644 dlls/hhctrl.ocx/Hu.rc diff --git a/dlls/hhctrl.ocx/Hu.rc b/dlls/hhctrl.ocx/Hu.rc new file mode 100644 index 0000000..8830734 --- /dev/null +++ b/dlls/hhctrl.ocx/Hu.rc @@ -0,0 +1,58 @@ +/* + * HTML Help resources + * Hungarian Language Support + * + * Copyright 2006 Andras Kovacs + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_CONTENTS "&Tartalom" + IDS_INDEX "I&ndex" + IDS_SEARCH "&Keres�s" + IDS_FAVORITES "Kedven&cek" +END + +STRINGTABLE +BEGIN + IDTB_EXPAND "Megjelen�t�s" + IDTB_CONTRACT "Elrejt�s" + IDTB_STOP "Meg�ll�t�s" + IDTB_REFRESH "Friss�t�s" + IDTB_BACK "Vissza" + IDTB_HOME "Kezd�lap" + IDTB_SYNC "Szink." + IDTB_PRINT "Nyomtat�s" + IDTB_OPTIONS "Opci�k" + IDTB_FORWARD "El�re" + IDTB_NOTES "IDTB_NOTES" + IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" + IDTB_BROWSE_BACK "IDT_BROWSE_BACK" + IDTB_CONTENTS "IDTB_CONTENTS" + IDTB_INDEX "IDTB_INDEX" + IDTB_SEARCH "IDTB_SEARCH" + IDTB_HISTORY "IDTB_HISTORY" + IDTB_FAVORITES "IDTB_FAVORITES" + IDTB_JUMP1 "Jump1" + IDTB_JUMP2 "Jump2" + IDTB_CUSTOMIZE "Testreszab�s" + IDTB_ZOOM "Zoom" + IDTB_TOC_NEXT "IDTB_TOC_NEXT" + IDTB_TOC_PREV "IDTB_TOC_PREV" +END diff --git a/dlls/hhctrl.ocx/hhctrl.rc b/dlls/hhctrl.ocx/hhctrl.rc index 18c1d13..0c7a08b 100644 --- a/dlls/hhctrl.ocx/hhctrl.rc +++ b/dlls/hhctrl.ocx/hhctrl.rc @@ -33,6 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "De.rc" #include "En.rc" #include "Fi.rc" +#include "Hu.rc" #include "Ko.rc" #include "Nl.rc" #include "No.rc"

1 0

András Kovács : comctl32: Added Hungarian translation.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: b4a81b71f2105524a37adca9c72d25cdce812595 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b4a81b71f2105524a37adca… Author: András Kovács <andras(a)csevego.net> Date: Mon Mar 6 12:47:11 2006 +0100 comctl32: Added Hungarian translation. --- dlls/comctl32/comctl_Hu.rc | 87 ++++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/rsrc.rc | 1 + 2 files changed, 88 insertions(+), 0 deletions(-) create mode 100644 dlls/comctl32/comctl_Hu.rc diff --git a/dlls/comctl32/comctl_Hu.rc b/dlls/comctl32/comctl_Hu.rc new file mode 100644 index 0000000..33ccfd7 --- /dev/null +++ b/dlls/comctl32/comctl_Hu.rc @@ -0,0 +1,87 @@ +/* + * Copyright 2006 Andras Kovacs + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Tulajdons�gok: " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "M�gse", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Alkalmaz�s", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "S�g�", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "F�l", 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 "Var�zsl�" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< &El�z�", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&K�vetkez� >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "K�sz", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "M�gse", IDCANCEL,178,138,50,14 + PUSHBUTTON "S�g�", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "F�l", 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 "Eszk�zt�r testreszab�sa" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Bez�r�s", IDCANCEL,308,6,44,14 + PUSHBUTTON "Alaph&elyzet", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&S�g�", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "&Fel", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "&Le", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "El&�rhet� gombok:", -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 "&Hozz�ad ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- El&vesz", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "E&szk�zt�r gombok:", -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 "Bez�r�s" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "Ma:" + IDM_GOTODAY "Ugr�s m�ra" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "Elv�laszt�" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "Nincs" +} diff --git a/dlls/comctl32/rsrc.rc b/dlls/comctl32/rsrc.rc index fa1cc3d..54141f8 100644 --- a/dlls/comctl32/rsrc.rc +++ b/dlls/comctl32/rsrc.rc @@ -1199,6 +1199,7 @@ IDI_TT_ERROR_SM ICON LOADONCALL DISCARDA #include "comctl_En.rc" #include "comctl_Es.rc" #include "comctl_Fr.rc" +#include "comctl_Hu.rc" #include "comctl_It.rc" #include "comctl_Ja.rc" #include "comctl_Ko.rc"

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2006