June 2007 - Wine-Commits - list.winehq.org

Julien Muchembled : msvfw32: Fix enumeration of VFW video codecs that are registered in the registry.
by Alexandre Julliard June 1, 2007

June 1, 2007

Module: wine Branch: master Commit: 79e19b91a8de5bdba8bb4e28eeb1e2de407b7029 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79e19b91a8de5bdba8bb4e28e… Author: Julien Muchembled <jm(a)jm10.no-ip.com> Date: Fri Jun 1 00:25:15 2007 +0200 msvfw32: Fix enumeration of VFW video codecs that are registered in the registry. --- dlls/msvfw32/msvideo_main.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 1361d30..85a08fa 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -107,9 +107,8 @@ typedef BOOL (*enum_handler_t)(const char*, int, void*); static BOOL enum_drivers(DWORD fccType, enum_handler_t handler, void* param) { CHAR buf[2048], fccTypeStr[5], *s; - DWORD i, cnt = 0, bufLen, lRet; + DWORD i, cnt = 0, lRet; BOOL result = FALSE; - FILETIME lastWrite; HKEY hKey; fourcc_to_string(fccTypeStr, fccType); @@ -119,14 +118,17 @@ static BOOL enum_drivers(DWORD fccType, enum_handler_t handler, void* param) lRet = RegOpenKeyExA(HKEY_LOCAL_MACHINE, HKLM_DRIVERS32, 0, KEY_QUERY_VALUE, &hKey); if (lRet == ERROR_SUCCESS) { - DWORD numkeys; - RegQueryInfoKeyA( hKey, 0, 0, 0, &numkeys, 0, 0, 0, 0, 0, 0, 0); - for (i = 0; i < numkeys; i++) + DWORD name, data, type; + i = 0; + for (;;) { - bufLen = sizeof(buf) / sizeof(buf[0]); - lRet = RegEnumKeyExA(hKey, i, buf, &bufLen, 0, 0, 0, &lastWrite); + name = 10; + data = sizeof buf - name; + lRet = RegEnumValueA(hKey, i++, buf, &name, 0, &type, (LPBYTE)(buf+name), &data); + if (lRet == ERROR_NO_MORE_ITEMS) break; if (lRet != ERROR_SUCCESS) continue; - if (strncasecmp(buf, fccTypeStr, 5) || buf[9] != '=') continue; + if (name != 9 || strncasecmp(buf, fccTypeStr, 5)) continue; + buf[name] = '='; if ((result = handler(buf, cnt++, param))) break; } RegCloseKey( hKey );

1 0

Misha Koshelev : comctl32: imagelist: Fix simultaneous selection of one bitmap into two device contexts.
by Alexandre Julliard June 1, 2007

June 1, 2007

Module: wine Branch: master Commit: fc5a746104bf8eedee25b686d9639b17d521c37a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc5a746104bf8eedee25b686d… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu May 31 23:32:41 2007 -0500 comctl32: imagelist: Fix simultaneous selection of one bitmap into two device contexts. --- dlls/comctl32/imagelist.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 3c9e89b..ee1ef0e 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2563,7 +2563,7 @@ BOOL WINAPI ImageList_SetImageCount (HIMAGELIST himl, UINT iImageCount) { HDC hdcBitmap; - HBITMAP hbmNewBitmap; + HBITMAP hbmNewBitmap, hbmOld; INT nNewCount, nCopyCount; TRACE("%p %d\n",himl,iImageCount); @@ -2588,8 +2588,9 @@ ImageList_SetImageCount (HIMAGELIST himl, UINT iImageCount) if (hbmNewBitmap != 0) { - SelectObject (hdcBitmap, hbmNewBitmap); + hbmOld = SelectObject (hdcBitmap, hbmNewBitmap); imagelist_copy_images( himl, himl->hdcImage, hdcBitmap, 0, nCopyCount, 0 ); + SelectObject (hdcBitmap, hbmOld); /* FIXME: delete 'empty' image space? */ @@ -2607,8 +2608,9 @@ ImageList_SetImageCount (HIMAGELIST himl, UINT iImageCount) hbmNewBitmap = CreateBitmap (sz.cx, sz.cy, 1, 1, NULL); if (hbmNewBitmap != 0) { - SelectObject (hdcBitmap, hbmNewBitmap); + hbmOld = SelectObject (hdcBitmap, hbmNewBitmap); imagelist_copy_images( himl, himl->hdcMask, hdcBitmap, 0, nCopyCount, 0 ); + SelectObject (hdcBitmap, hbmOld); /* FIXME: delete 'empty' image space? */

1 0

James Hawkins : msi: Implement SummaryInfo::Property get.
by Alexandre Julliard June 1, 2007

June 1, 2007

Module: wine Branch: master Commit: f083b3c038eb5b849bfd838a78f32a5f59f0774c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f083b3c038eb5b849bfd838a7… Author: James Hawkins <truiken(a)gmail.com> Date: Thu May 31 19:52:05 2007 -0700 msi: Implement SummaryInfo::Property get. --- dlls/msi/automation.c | 136 ++++++++++++++++++++++++++++++++++++++++++ dlls/msi/msiserver.idl | 4 + dlls/msi/msiserver_dispids.h | 3 + include/msidefs.h | 2 +- 4 files changed, 144 insertions(+), 1 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index be47cb6..6b1f6c2 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -730,6 +730,114 @@ HRESULT WINAPI DispGetParam_CopyOnly( &pdispparams->rgvarg[pos]); } +static HRESULT WINAPI SummaryInfoImpl_Invoke( + AutomationObject* This, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + UINT ret; + VARIANTARG varg0; + HRESULT hr; + + VariantInit(&varg0); + + switch (dispIdMember) + { + case DISPID_SUMMARYINFO_PROPERTY: + if (wFlags & DISPATCH_PROPERTYGET) + { + UINT type; + INT value; + INT pid; + + static WCHAR szEmpty[] = {0}; + + VariantClear(pVarResult); + + hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); + if (FAILED(hr)) return hr; + pid = V_I4(&varg0); + + if (pid == PID_CODEPAGE || (pid >= PID_PAGECOUNT && pid <= PID_CHARCOUNT) || PID_SECURITY) + { + ret = MsiSummaryInfoGetPropertyW(This->msiHandle, pid, &type, &value, + NULL, NULL, NULL); + if (ret != ERROR_SUCCESS) + return DISP_E_EXCEPTION; + + if (pid == PID_CODEPAGE) + { + V_VT(pVarResult) = VT_I2; + V_I2(pVarResult) = value; + } + else + { + V_VT(pVarResult) = VT_I4; + V_I4(pVarResult) = value; + } + } + else if ((pid >= PID_TITLE && pid <= PID_REVNUMBER) || pid == PID_APPNAME) + { + LPWSTR str; + DWORD size = 0; + + ret = MsiSummaryInfoGetPropertyW(This->msiHandle, pid, &type, NULL, + NULL, szEmpty, &size); + if (ret != ERROR_MORE_DATA) + return DISP_E_EXCEPTION; + + str = msi_alloc(++size * sizeof(WCHAR)); + if (!str) + return DISP_E_EXCEPTION; + + ret = MsiSummaryInfoGetPropertyW(This->msiHandle, pid, &type, NULL, + NULL, str, &size); + if (ret != ERROR_SUCCESS) + { + msi_free(str); + return DISP_E_EXCEPTION; + } + + V_VT(pVarResult) = VT_BSTR; + V_BSTR(pVarResult) = SysAllocString(str); + msi_free(str); + } + else if (pid >= PID_EDITTIME && pid <= PID_LASTSAVE_DTM) + { + FILETIME ft; + SYSTEMTIME st; + DATE date; + + ret = MsiSummaryInfoGetPropertyW(This->msiHandle, pid, &type, &value, + &ft, NULL, NULL); + if (ret != ERROR_SUCCESS) + return DISP_E_EXCEPTION; + + FileTimeToSystemTime(&ft, &st); + SystemTimeToVariantTime(&st, &date); + + V_VT(pVarResult) = VT_DATE; + V_DATE(pVarResult) = date; + } + } + else return DISP_E_MEMBERNOTFOUND; + break; + + default: + ERR("Member not found: %d\n", dispIdMember); + return DISP_E_MEMBERNOTFOUND; + } + + VariantClear(&varg0); + return S_OK; +} + static HRESULT WINAPI RecordImpl_Invoke( AutomationObject* This, DISPID dispIdMember, @@ -1010,6 +1118,34 @@ static HRESULT WINAPI DatabaseImpl_Invoke( switch (dispIdMember) { + case DISPID_DATABASE_SUMMARYINFORMATION: + if (wFlags & DISPATCH_METHOD) + { + hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); + if (FAILED(hr)) + V_I4(&varg0) = 0; + + V_VT(pVarResult) = VT_DISPATCH; + if ((ret = MsiGetSummaryInformationW(This->msiHandle, NULL, V_I4(&varg0), &msiHandle)) == ERROR_SUCCESS) + { + hr = create_automation_object(msiHandle, NULL, (LPVOID *)&pDispatch, &DIID_SummaryInfo, SummaryInfoImpl_Invoke, NULL, 0); + if (SUCCEEDED(hr)) + { + IDispatch_AddRef(pDispatch); + V_DISPATCH(pVarResult) = pDispatch; + } + else + ERR("Failed to create SummaryInfo object: 0x%08x\n", hr); + } + else + { + ERR("MsiGetSummaryInformation returned %d\n", ret); + return DISP_E_EXCEPTION; + } + } + else return DISP_E_MEMBERNOTFOUND; + break; + case DISPID_DATABASE_OPENVIEW: if (wFlags & DISPATCH_METHOD) { diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 66a7e9d..a626e8c 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -146,6 +146,8 @@ library WindowsInstaller { properties: methods: + [id(DISPID_SUMMARYINFO_PROPERTY), propget] + VARIANT Property([in] long Pid); } typedef enum { @@ -188,6 +190,8 @@ library WindowsInstaller methods: [id(DISPID_DATABASE_OPENVIEW)] View* OpenView([in] BSTR Sql); + [id(DISPID_DATABASE_SUMMARYINFORMATION)] + SummaryInfo *SummaryInformation([in, optional, defaultvalue(0)] long UpdateCount); } typedef enum { diff --git a/dlls/msi/msiserver_dispids.h b/dlls/msi/msiserver_dispids.h index c3dd07a..c01adbe 100644 --- a/dlls/msi/msiserver_dispids.h +++ b/dlls/msi/msiserver_dispids.h @@ -39,6 +39,7 @@ #define DISPID_VIEW_MODIFY 3 #define DISPID_VIEW_CLOSE 4 +#define DISPID_DATABASE_SUMMARYINFORMATION 2 #define DISPID_DATABASE_OPENVIEW 3 #define DISPID_SESSION_INSTALLER 1 @@ -51,3 +52,5 @@ #define DISPID_SESSION_FEATURECURRENTSTATE 13 #define DISPID_SESSION_FEATUREREQUESTSTATE 14 #define DISPID_SESSION_SETINSTALLLEVEL 19 + +#define DISPID_SUMMARYINFO_PROPERTY 1 diff --git a/include/msidefs.h b/include/msidefs.h index cf022d6..9e1e75d 100644 --- a/include/msidefs.h +++ b/include/msidefs.h @@ -229,7 +229,7 @@ enum msidbServiceControlEvent #define PID_TEMPLATE 7 #define PID_LASTAUTHOR 8 #define PID_REVNUMBER 9 -#define PID_EDITTINE 10 +#define PID_EDITTIME 10 #define PID_LASTPRINTED 11 #define PID_CREATE_DTM 12 #define PID_LASTSAVE_DTM 13

1 0

James Hawkins : msi: Implement Installer::OpenDatabase.
by Alexandre Julliard June 1, 2007

June 1, 2007

Module: wine Branch: master Commit: 7a289624cfcbc829aabc614093bbd5ae01251529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a289624cfcbc829aabc61409… Author: James Hawkins <truiken(a)gmail.com> Date: Thu May 31 19:49:52 2007 -0700 msi: Implement Installer::OpenDatabase. --- dlls/msi/automation.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/msi/msiserver.idl | 4 ++++ dlls/msi/msiserver_dispids.h | 1 + 3 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 63fea99..be47cb6 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1433,6 +1433,43 @@ static HRESULT WINAPI InstallerImpl_Invoke( else return DISP_E_MEMBERNOTFOUND; break; + case DISPID_INSTALLER_OPENDATABASE: + if (wFlags & DISPATCH_METHOD) + { + hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); + if (FAILED(hr)) return hr; + + hr = DispGetParam(pDispParams, 1, VT_BSTR, &varg1, puArgErr); + if (FAILED(hr)) + { + VariantClear(&varg0); + return hr; + } + + V_VT(pVarResult) = VT_DISPATCH; + if ((ret = MsiOpenDatabaseW(V_BSTR(&varg0), V_BSTR(&varg1), &msiHandle)) == ERROR_SUCCESS) + { + hr = create_automation_object(msiHandle, NULL, (LPVOID *)&pDispatch, + &DIID_Database, DatabaseImpl_Invoke, NULL, 0); + if (SUCCEEDED(hr)) + { + IDispatch_AddRef(pDispatch); + V_DISPATCH(pVarResult) = pDispatch; + } + else + ERR("Failed to create Database object: 0x%08x\n", hr); + } + else + { + VariantClear(&varg0); + VariantClear(&varg1); + ERR("MsiOpenDatabase returned %d\n", ret); + return DISP_E_EXCEPTION; + } + } + else return DISP_E_MEMBERNOTFOUND; + break; + case DISPID_INSTALLER_INSTALLPRODUCT: if (wFlags & DISPATCH_METHOD) { @@ -1676,6 +1713,7 @@ static HRESULT WINAPI InstallerImpl_Invoke( break; default: + ERR("Member not found: %d\n", dispIdMember); return DISP_E_MEMBERNOTFOUND; } diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 3c0428b..66a7e9d 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -66,6 +66,10 @@ library WindowsInstaller Session* OpenPackage( [in] VARIANT PackagePath, [in, optional, defaultvalue(0)] long Options); + [id(DISPID_INSTALLER_OPENDATABASE)] + Database *OpenDatabase( + [in] BSTR DatabasePath, + [in] VARIANT OpenMode); [id(DISPID_INSTALLER_INSTALLPRODUCT)] void InstallProduct( [in] BSTR PackagePath, diff --git a/dlls/msi/msiserver_dispids.h b/dlls/msi/msiserver_dispids.h index 694090e..c3dd07a 100644 --- a/dlls/msi/msiserver_dispids.h +++ b/dlls/msi/msiserver_dispids.h @@ -18,6 +18,7 @@ #define DISPID_INSTALLER_CREATERECORD 1 #define DISPID_INSTALLER_OPENPACKAGE 2 +#define DISPID_INSTALLER_OPENDATABASE 3 #define DISPID_INSTALLER_INSTALLPRODUCT 8 #define DISPID_INSTALLER_REGISTRYVALUE 11 #define DISPID_INSTALLER_PRODUCTSTATE 17

1 0

Alexander Nicolaysen Sørnes : localui: Add Norwegian Bokmål resources.
by Alexandre Julliard June 1, 2007

June 1, 2007

Module: wine Branch: master Commit: 91a9252a8fda826302e2f7499b459febbdc877f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91a9252a8fda826302e2f7499… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu May 31 19:32:15 2007 +0200 localui: Add Norwegian Bokmål resources. --- dlls/localui/localui.rc | 1 + dlls/localui/ui_No.rc | 54 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/localui/localui.rc b/dlls/localui/localui.rc index 2486342..6abfe43 100644 --- a/dlls/localui/localui.rc +++ b/dlls/localui/localui.rc @@ -40,4 +40,5 @@ #include "ui_De.rc" #include "ui_En.rc" +#include "ui_No.rc" #include "ui_Pl.rc" diff --git a/dlls/localui/ui_No.rc b/dlls/localui/ui_No.rc new file mode 100644 index 0000000..3a46bc8 --- /dev/null +++ b/dlls/localui/ui_No.rc @@ -0,0 +1,54 @@ +/* + * Norwegian Bokm�l resources for localui + * + * Copyright 2007 Alexander N. S�rnes <alex(a)thehandofagony.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Legg til en lokal port" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Skriv inn navn&et p� den nye porten:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "Avbryt", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Oppsett av LPT-port" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Tidsavbrudd (sekunder)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "Pr�v � sende p� nyt&t:", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Avbryt", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Lokal port" + IDS_INVALIDNAME "�%s� er ikke et gyldig portnavn" + IDS_PORTEXISTS "Porten %s finnes allerede" + IDS_NOTHINGTOCONFIG "Denne porten har ingen innstillinger" +}

1 0

Dmitry Timoshkov : comctl32: Fix a compilation warning in 64-bit mode.
by Alexandre Julliard June 1, 2007

June 1, 2007

Module: wine Branch: master Commit: 18366472c7d996fba794df79dace025c539c83cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=18366472c7d996fba794df79d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu May 31 23:00:27 2007 +0900 comctl32: Fix a compilation warning in 64-bit mode. --- dlls/comctl32/toolbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 2dc9a01..4b1e552 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -2668,7 +2668,7 @@ TOOLBAR_AddBitmapToImageList(TOOLBAR_INFO *infoPtr, HIMAGELIST himlDef, const TB TRACE("adding hInst=%p nID=%d nButtons=%d\n", bitmap->hInst, bitmap->nID, bitmap->nButtons); /* Add bitmaps to the default image list */ if (bitmap->hInst == NULL) /* a handle was passed */ - hbmLoad = (HBITMAP)CopyImage((HBITMAP)bitmap->nID, IMAGE_BITMAP, 0, 0, 0); + hbmLoad = (HBITMAP)CopyImage(ULongToHandle(bitmap->nID), IMAGE_BITMAP, 0, 0, 0); else hbmLoad = CreateMappedBitmap(bitmap->hInst, bitmap->nID, 0, NULL, 0);

1 0

Alexander Nicolaysen Sørnes : cmd: Update Norwegian Bokmål resources.
by Alexandre Julliard June 1, 2007

June 1, 2007

Module: wine Branch: master Commit: c14832d7145abccbb75df7138cdc46742df58b6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c14832d7145abccbb75df7138… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu May 31 20:11:30 2007 +0200 cmd: Update Norwegian Bokmål resources. --- programs/cmd/No.rc | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/programs/cmd/No.rc b/programs/cmd/No.rc index 52cc524..aff4ffa 100644 --- a/programs/cmd/No.rc +++ b/programs/cmd/No.rc @@ -2,7 +2,7 @@ * Wine command prompt * Norwegian Bokm�l Language Support * - * Copyright (C) 2005 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright (C) 2005-2007 Alexander N. S�rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -61,7 +61,7 @@ et @-tegn foran den.\n" \n\ Syntaks: FOR %variabel IN (sett) DO kommando\n\ \n\ -Kravet om to %-tegn n�r FOR brukes i en satsvis fil finnes ikke i CMD.\n" +Kravet om to %-tegn n�r FOR brukes i en satsvis fil finnes ikke i Wines CMD.\n" WCMD_GOTO, "GOTO-kommandoen flytter kj�ringen til et annet sted i en satsvis fil.\n\ @@ -79,7 +79,7 @@ GOTO har ingen effekt n�r den brukes interaktivt.\n" WCMD_IF, "IF brukes til � kj�re en kommando p� betingelser.\n\ \n\ -Syntax: IF [NOT] EXIST filnavn kommando\n\ +Bruk: IF [NOT] EXIST filnavn kommando\n\ IF [NOT] streng1==streng2 kommando\n\ IF [NOT] ERRORLEVEL nummer kommando\n\ \n\ @@ -195,7 +195,12 @@ VERIFY Viser ON hvis p� ellerr OFF hvis av.\n\ WCMD_VOL, "Hjelp til VOL\n" - WCMD_MORE, "MORE displays output of files or piped input in pages.\n" + WCMD_PUSHD, "PUSHD <katalognavn> lagrer arbeidskatalogen i en stabel, og endrer deretter\n\ +arbeidskatalog til den som er oppgitt.\n" + + WCMD_POPD, "POPD endrer arbeidskatalog til den som sist ble brukt med PUSHD.\n" + + WCMD_MORE, "MORE lar deg bla gjennom innholdet i filer eller inndata i r�r.\n" WCMD_EXIT, "EXIT avslutter gjeldende kommando�kt og returnerer til operativsystemet\n\ @@ -217,7 +222,9 @@ MD (MKDIR)\tLager en underkatalog\n\ MORE\t\tDisplay output in pages\n\ MOVE\t\tFlytter en eller flere filer, eller en katalogtre\n\ PATH\t\tEndrer eller viser s�kestien\n\ +POPD\t\tEndrer arbeidskatalog til den sist lagret med PUSHD\n\ PROMPT\t\tEndrer kommando-klartegnet\n\ +PUSHD\t\tEndrer arbeidskatalog og lagrer den gjeldende\n\ REN (RENAME)\tGir nytt navn til en fil\n\ RD (RMDIR)\tSletter en underkatalog\n\ SET\t\tAngir eller viser milj�variabler\n\ @@ -229,11 +236,11 @@ VOL\t\tViser volumnavnet til en stasjon\n\ EXIT\t\tAvslutter CMD\n\n\ Skriv �HELP <kommando>� for mer informasjon om kommandoene ovenfor\n" - WCMD_CONFIRM, "Are you sure" - WCMD_YES, "Y" + WCMD_CONFIRM, "Er du sikker" + WCMD_YES, "J" WCMD_NO, "N" - WCMD_NOASSOC, "File association missing for extension %s\n" - WCMD_NOFTYPE, "No open command associated with file type '%s'\n" - WCMD_OVERWRITE, "Overwrite" - WCMD_MORESTR, "More..." + WCMD_NOASSOC, "Manglende filtilknytning for etternavnet %s\n" + WCMD_NOFTYPE, "Ingen �pnekommando er tilknyttet filtypene '%s'\n" + WCMD_OVERWRITE, "Overskriv" + WCMD_MORESTR, "Mer . . ." }

1 0

Alexander Nicolaysen Sørnes : shdoclc: Update Norwegian Bokmål resources.
by Alexandre Julliard June 1, 2007

June 1, 2007

Module: wine Branch: master Commit: 10f06918b40772374a0a0bf4a664dabbe13cde1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=10f06918b40772374a0a0bf4a… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu May 31 19:50:37 2007 +0200 shdoclc: Update Norwegian Bokmål resources. --- dlls/shdoclc/No.rc | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/shdoclc/No.rc b/dlls/shdoclc/No.rc index 97173ba..a02a4af 100644 --- a/dlls/shdoclc/No.rc +++ b/dlls/shdoclc/No.rc @@ -1,5 +1,5 @@ /* - * Copyright 2005 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2007 Alexander N. S�rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,6 +19,17 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +STRINGTABLE DISCARDABLE +{ + IDS_MESSAGE_BOX_TITLE, "Wine Internet Explorer" +} + +STRINGTABLE DISCARDABLE +{ + IDS_PRINT_HEADER_TEMPLATE "&w&bSide &p" /* FIXME: should be "&w&bPage &p of &P" */ + IDS_PRINT_FOOTER_TEMPLATE "&u&b&d" +} + IDR_BROWSE_CONTEXT_MENU MENU { POPUP "Standard" @@ -193,11 +204,11 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "Dump sporingsinformasjon", IDM_DUMPTRACKINGINFO MENUITEM "Feils�kingspause", IDM_DEBUGBREAK MENUITEM "Feils�kingsvisning", IDM_DEBUGVIEW - MENUITEM "Dump 'Tree'", IDM_DUMPTREE - MENUITEM "Dump 'Lines'", IDM_DUMPLINES - MENUITEM "Dump 'DisplayTree'", IDM_DUMPDISPLAYTREE - MENUITEM "Dump 'FormatCaches'", IDM_DUMPFORMATCACHES - MENUITEM "Dump 'LayoutRects'", IDM_DUMPLAYOUTRECTS + MENUITEM "Dump �Tree�", IDM_DUMPTREE + MENUITEM "Dump �Lines�", IDM_DUMPLINES + MENUITEM "Dump �DisplayTree�", IDM_DUMPDISPLAYTREE + MENUITEM "Dump �FormatCaches�", IDM_DUMPFORMATCACHES + MENUITEM "Dump �LayoutRects�", IDM_DUMPLAYOUTRECTS MENUITEM "Minneoverv�ker", IDM_MEMORYMONITOR MENUITEM "Ytelsesm�lere", IDM_PERFORMANCEMETERS MENUITEM "Lagre HTML", IDM_SAVEHTML

1 0

James Hawkins : msi: Add handling for MsiBreak.
by Alexandre Julliard June 1, 2007

June 1, 2007

Module: wine Branch: master Commit: 60e95ee6e8ea4a4f43a6c170c917fc7285b76455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60e95ee6e8ea4a4f43a6c170c… Author: James Hawkins <truiken(a)gmail.com> Date: Thu May 31 13:21:43 2007 -0700 msi: Add handling for MsiBreak. --- dlls/msi/custom.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index eaf5ce9..0216f03 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -514,6 +514,40 @@ static msi_custom_action_info *find_action_by_guid( const GUID *guid ) return info; } +static void handle_msi_break( LPCWSTR target ) +{ + LPWSTR msg; + WCHAR val[MAX_PATH]; + + static const WCHAR MsiBreak[] = { 'M','s','i','B','r','e','a','k',0 }; + static const WCHAR WindowsInstaller[] = { + 'W','i','n','d','o','w','s',' ','I','n','s','t','a','l','l','e','r',0 + }; + + static const WCHAR format[] = { + 'T','o',' ','d','e','b','u','g',' ','y','o','u','r',' ', + 'c','u','s','t','o','m',' ','a','c','t','i','o','n',',',' ', + 'a','t','t','a','c','h',' ','y','o','u','r',' ','d','e','b','u','g','g','e','r',' ', + 't','o',' ','p','r','o','c','e','s','s',' ','%','i',' ','(','0','x','%','X',')',' ', + 'a','n','d',' ','p','r','e','s','s',' ','O','K',0 + }; + + if( !GetEnvironmentVariableW( MsiBreak, val, MAX_PATH )) + return; + + if( lstrcmpiW( val, target )) + return; + + msg = msi_alloc( (lstrlenW(format) + 10) * sizeof(WCHAR) ); + if (!msg) + return; + + wsprintfW( msg, format, GetCurrentProcessId(), GetCurrentProcessId()); + MessageBoxW( NULL, msg, WindowsInstaller, MB_OK); + msi_free(msg); + DebugBreak(); +} + static DWORD WINAPI ACTION_CallDllFunction( const GUID *guid ) { msi_custom_action_info *info; @@ -548,6 +582,7 @@ static DWORD WINAPI ACTION_CallDllFunction( const GUID *guid ) if (hPackage) { TRACE("calling %s\n", debugstr_w( info->target ) ); + handle_msi_break( info->target ); r = fn( hPackage ); MsiCloseHandle( hPackage ); }

1 0

Alexander Nicolaysen Sørnes : regedit: Update Norwegian Bokmål resources.
by Alexandre Julliard June 1, 2007

June 1, 2007

Module: wine Branch: master Commit: 49437bf88685bd45a326d8f7ded882df0594046e URL: http://source.winehq.org/git/wine.git/?a=commit;h=49437bf88685bd45a326d8f7d… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu May 31 18:44:40 2007 +0200 regedit: Update Norwegian Bokmål resources. --- programs/regedit/No.rc | 34 +++++++++++++++++++++++++--------- 1 files changed, 25 insertions(+), 9 deletions(-) diff --git a/programs/regedit/No.rc b/programs/regedit/No.rc index 04d6ba6..53265a8 100644 --- a/programs/regedit/No.rc +++ b/programs/regedit/No.rc @@ -1,7 +1,7 @@ /* * Regedit Norwegian Bokm�l resources * - * Copyright 2005-2006 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2007 Alexander N. S�rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -58,9 +58,10 @@ BEGIN BEGIN MENUITEM "N�&kkel", ID_EDIT_NEW_KEY MENUITEM SEPARATOR - MENUITEM "&Strengverdi", ID_EDIT_NEW_STRINGVALUE - MENUITEM "&Bin�rverdi", ID_EDIT_NEW_BINARYVALUE - MENUITEM "&DWORD-verdi", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Strengverdi", ID_EDIT_NEW_STRINGVALUE + MENUITEM "&Bin�rverdi", ID_EDIT_NEW_BINARYVALUE + MENUITEM "&DWORD-verdi", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Flerstrengverdi", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "&Slett\tDel", ID_EDIT_DELETE @@ -97,10 +98,10 @@ BEGIN POPUP "" BEGIN MENUITEM "&Endre", ID_EDIT_MODIFY - MENUITEM "Modify Binary Data", ID_EDIT_MODIFY_BIN + MENUITEM "Endre bin�rdata", ID_EDIT_MODIFY_BIN MENUITEM SEPARATOR MENUITEM "&Slett\tDel", ID_EDIT_DELETE - MENUITEM "&Gi nytt navn", ID_EDIT_RENAME + MENUITEM "&Gi nytt navn", ID_EDIT_RENAME END POPUP "" BEGIN @@ -108,9 +109,10 @@ BEGIN BEGIN MENUITEM "N�&kkel", ID_EDIT_NEW_KEY MENUITEM SEPARATOR - MENUITEM "&Strengverdi", ID_EDIT_NEW_STRINGVALUE - MENUITEM "&Bin�rverdi", ID_EDIT_NEW_BINARYVALUE - MENUITEM "&DWORD-verdi", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Strengverdi", ID_EDIT_NEW_STRINGVALUE + MENUITEM "&Bin�rverdi", ID_EDIT_NEW_BINARYVALUE + MENUITEM "&DWORD-verdi", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Flerstrengverdi", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "&Slett\tDel", ID_EDIT_DELETE @@ -218,6 +220,19 @@ BEGIN PUSHBUTTON "Avbryt",IDCANCEL,175,80,30,11,WS_GROUP END +IDD_EDIT_MULTI_STRING DIALOG DISCARDABLE 22, 17, 210, 175 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Rediger flerstreng" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Verdinavn:",IDC_STATIC,5,5,119,8 + EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED + LTEXT "Verdidata:",IDC_STATIC,5,30,119,8 + EDITTEXT IDC_VALUE_DATA,5,40,200,112, WS_BORDER | WS_TABSTOP | WS_HSCROLL | WS_VSCROLL | ES_MULTILINE | ES_WANTRETURN + DEFPUSHBUTTON "OK",IDOK,140,160,30,11,WS_GROUP + PUSHBUTTON "Avbryt",IDCANCEL,175,160,30,11,WS_GROUP +END + /* * String Table */ @@ -253,6 +268,7 @@ BEGIN ID_EDIT_NEW_STRINGVALUE "Legger til en ny strengverdi" ID_EDIT_NEW_BINARYVALUE "Legger til en ny bin�rverdis" ID_EDIT_NEW_DWORDVALUE "Legger til en ny dobbeltord-verdi" + ID_EDIT_NEW_MULTI_STRINGVALUE "Legger til en ny flerstrengverdi" ID_REGISTRY_IMPORTREGISTRYFILE "Importerer en tekstfil inn i registeret" ID_REGISTRY_EXPORTREGISTRYFILE "Eksporterer hele eller deler av registeret til en tekstfil"

1 0