Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[gvg] 18348: Sync to Wine-20050930:

by gvg＠svn.reactos.com

Sync to Wine-20050930: Michael Jung <mjung(a)iss.tu-darmstadt.de> - Don't clone pidlLast in SHBindToParent. - Pass correct pointer to SHFree in case of failure in UNIXFS_path_to_pidl. - Return E_FAIL if we can't get the unix path in IPersistFolder3::InitializeEx. - Return E_NOAGGREGATION if non-NULL pUnkOuter is given to the constructor. Alexandre Julliard <julliard(a)winehq.org> - We are no longer generating .spec.c files. - Generate 16-bit spec files as assembly code too. - Use a more portable scheme for storing the name of a critical section. - Removed unused debug channels. - Specify 64-bit integers as double instead of long long in spec files so that we get the correct number of arguments. - We are no longer generating .dbg.c files. Milko Krachounov <milko(a)3mhz.net> - Bulgarian resources for mpr, msi, user, commdlg, oleaut32, shdocvw, shell32, comctl32, msrle32, mshtml, winspool, wineps, serialui, setupapi, wininet, regedit, uninstaller, notepad, winecfg and winhelp. Kevin Koltzau <kevin(a)plop.org> - Fix warnings in 64bit. Dmitry Timoshkov <dmitry(a)codeweavers.com> - Stop using a not initialized variable szTemp in _dbg_ILSimpleGetText, make _dbg_ILSimpleGetText return no value since nobody is using it. - Stop dereferencing a possible NULL in pdump since _dbg_ILGetDataPointer can potentially return NULL (for instance for root or desktop pidl). - Make shdebugstr_guid use standard wine_dbg_sprintf instead of the handmade solution. - Translate file name from unix to ANSI encoding in UnixFolder_IShellFolder2_GetDisplayNameOf. - Pass a locally modified version of SHELLEXECUTEINFO to IShellExecuteHookW_Execute, this should pass through at least sei_tmp.nShow retrieved from an .lnk file (fStartup). Alexander N. Sørnes <alex(a)thehandofagony.com> - Added Norwegian translation of comctl32 and shell32. Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> - Update Finnish resources. Modified: trunk/reactos/lib/shell32/Makefile.in Modified: trunk/reactos/lib/shell32/brsfolder.c Modified: trunk/reactos/lib/shell32/changenotify.c Modified: trunk/reactos/lib/shell32/control.c Modified: trunk/reactos/lib/shell32/dde.c Modified: trunk/reactos/lib/shell32/debughlp.c Modified: trunk/reactos/lib/shell32/iconcache.c Modified: trunk/reactos/lib/shell32/pidl.c Modified: trunk/reactos/lib/shell32/shell.c Modified: trunk/reactos/lib/shell32/shell32.spec Added: trunk/reactos/lib/shell32/shell32_Bg.rc Modified: trunk/reactos/lib/shell32/shell32_Fi.rc Modified: trunk/reactos/lib/shell32/shell32_No.rc Modified: trunk/reactos/lib/shell32/shell32_main.c Modified: trunk/reactos/lib/shell32/shelllink.c Modified: trunk/reactos/lib/shell32/shellord.c Modified: trunk/reactos/lib/shell32/shellpath.c Modified: trunk/reactos/lib/shell32/shlexec.c Modified: trunk/reactos/lib/shell32/shlmenu.c Modified: trunk/reactos/lib/shell32/shres.rc Modified: trunk/reactos/lib/shell32/shv_bg_cmenu.c Modified: trunk/reactos/lib/shell32/shv_item_cmenu.c _____ Modified: trunk/reactos/lib/shell32/Makefile.in --- trunk/reactos/lib/shell32/Makefile.in 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/Makefile.in 2005-10-08 17:41:41 UTC (rev 18348) @@ -81,8 +81,8 @@ version16.res: version16.rc $(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/version16.rc -shell.spec.c: shell.spec version16.res - $(WINEBUILD) $(DEFS) $(DLLFLAGS) --dll -o $@ --main-module $(MODULE) --res version16.res --export $(SRCDIR)/shell.spec +shell.spec.o: shell.spec version16.res + $(WINEBUILD) $(WINEBUILDFLAGS) --dll -o $@ --main-module $(MODULE) --res version16.res --export $(SRCDIR)/shell.spec authors.c: $(TOPSRCDIR)/AUTHORS (LC_ALL=C; export LC_ALL; echo 'const char * const SHELL_Authors[] = {' && \ _____ Modified: trunk/reactos/lib/shell32/brsfolder.c --- trunk/reactos/lib/shell32/brsfolder.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/brsfolder.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -316,7 +316,7 @@ HRESULT hr; HWND hwnd = GetParent( info->hwndTreeView ); - TRACE("%p %p %x %p\n",lpsf, pidl, (INT)hParent, lpe); + TRACE("%p %p %p %p\n",lpsf, pidl, hParent, lpe); /* No IEnumIDList -> No children */ if (!lpe) return; _____ Modified: trunk/reactos/lib/shell32/changenotify.c --- trunk/reactos/lib/shell32/changenotify.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/changenotify.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -36,7 +36,7 @@ { 0, 0, &SHELL32_ChangenotifyCS, { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { 0, (DWORD)(__FILE__ ": SHELL32_ChangenotifyCS") } + 0, 0, { (DWORD_PTR)(__FILE__ ": SHELL32_ChangenotifyCS") } }; static CRITICAL_SECTION SHELL32_ChangenotifyCS = { &critsect_debug, -1, 0, 0, 0, 0 }; _____ Modified: trunk/reactos/lib/shell32/control.c --- trunk/reactos/lib/shell32/control.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/control.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -153,7 +153,7 @@ { CPanel* panel = (CPanel*)cs->lpCreateParams; - SetWindowLongA(hWnd, 0, (LPARAM)panel); + SetWindowLongPtrA(hWnd, 0, (LONG_PTR)panel); panel->status = 0; panel->hWnd = hWnd; } @@ -244,7 +244,7 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, WPARAM lParam1, LPARAM lParam2) { - CPanel* panel = (CPanel*)GetWindowLongA(hWnd, 0); + CPanel* panel = (CPanel*)GetWindowLongPtrA(hWnd, 0); if (panel || wMsg == WM_CREATE) { switch (wMsg) { _____ Modified: trunk/reactos/lib/shell32/dde.c --- trunk/reactos/lib/shell32/dde.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/dde.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -104,16 +104,16 @@ switch (uType) { case XTYP_CONNECT: - return (HDDEDATA)Dde_OnConnect(hsz1, hsz2); + return (HDDEDATA)(DWORD_PTR)Dde_OnConnect(hsz1, hsz2); case XTYP_CONNECT_CONFIRM: Dde_OnConnectConfirm(hconv, hsz1, hsz2); return NULL; case XTYP_WILDCONNECT: - return (HDDEDATA)Dde_OnWildConnect(hsz1, hsz2); + return (HDDEDATA)(DWORD_PTR)Dde_OnWildConnect(hsz1, hsz2); case XTYP_REQUEST: return (HDDEDATA)Dde_OnRequest(uFmt, hconv, hsz1, hsz2); case XTYP_EXECUTE: - return (HDDEDATA)Dde_OnExecute(hconv, hsz1, hdata); + return (HDDEDATA)(DWORD_PTR)Dde_OnExecute(hconv, hsz1, hdata); case XTYP_DISCONNECT: Dde_OnDisconnect(hconv); return NULL; _____ Modified: trunk/reactos/lib/shell32/debughlp.c --- trunk/reactos/lib/shell32/debughlp.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/debughlp.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -144,14 +144,12 @@ } static -DWORD _dbg_ILSimpleGetText (LPCITEMIDLIST pidl, LPSTR szOut, UINT uOutSize) +void _dbg_ILSimpleGetText (LPCITEMIDLIST pidl, LPSTR szOut, UINT uOutSize) { - DWORD dwReturn=0; LPSTR szSrc; GUID const * riid; - char szTemp[MAX_PATH]; - if (!pidl) return 0; + if (!pidl) return; if (szOut) *szOut = 0; @@ -160,13 +158,11 @@ { /* desktop */ if (szOut) lstrcpynA(szOut, "Desktop", uOutSize); - dwReturn = strlen ("Desktop"); } else if (( szSrc = _dbg_ILGetTextPointer(pidl) )) { /* filesystem */ if (szOut) lstrcpynA(szOut, szSrc, uOutSize); - dwReturn = strlen(szSrc); } else if (( riid = _dbg_ILGetGUIDPointer(pidl) )) { @@ -175,9 +171,7 @@ riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], riid->Data4[5], riid->Data4[6], riid->Data4[7] ); - dwReturn = strlen (szTemp); } - return dwReturn; } @@ -202,17 +196,18 @@ { DWORD dwAttrib = 0; LPPIDLDATA pData = _dbg_ILGetDataPointer(pidltemp); - DWORD type = pData->type; + DWORD type = pData ? pData->type : 0; LPSTR szLongName = _dbg_ILGetTextPointer(pidltemp); LPSTR szShortName = _dbg_ILGetSTextPointer(pidltemp); char szName[MAX_PATH]; _dbg_ILSimpleGetText(pidltemp, szName, MAX_PATH); - if( PT_FOLDER == type || PT_VALUE == type) + if ( pData && (PT_FOLDER == type || PT_VALUE == type) ) dwAttrib = pData->u.file.uFileAttribs; - MESSAGE ("[%p] size=%04u type=%lx attr=0x%08lx name=\"%s\" (%s,%s)\n", - pidltemp, pidltemp->mkid.cb,type,dwAttrib,szName,debugstr_a(szLongName), debugstr_a(szShortName)); + MESSAGE ("[%p] size=%04u type=%lx attr=0x%08lx name=%s (%s,%s)\n", + pidltemp, pidltemp->mkid.cb, type, dwAttrib, + debugstr_a(szName), debugstr_a(szLongName), debugstr_a(szShortName)); pidltemp = _dbg_ILGetNext(pidltemp); @@ -290,11 +285,7 @@ return TRUE; } -static char shdebugstr_buf1[100]; -static char shdebugstr_buf2[100]; -static char * shdebugstr_buf = shdebugstr_buf1; - -static struct { +static const struct { REFIID riid; const char *name; } InterfaceDesc[] = { @@ -328,11 +319,8 @@ const char* name = NULL; char clsidbuf[100]; - shdebugstr_buf = (shdebugstr_buf == shdebugstr_buf1) ? shdebugstr_buf2 : shdebugstr_buf1; + if (!id) return "(null)"; - if (!id) { - strcpy (shdebugstr_buf, "(null)"); - } else { for (i=0;InterfaceDesc[i].riid && !name;i++) { if (IsEqualIID(InterfaceDesc[i].riid, id)) name = InterfaceDesc[i].name; } @@ -341,10 +329,8 @@ name = clsidbuf; } - sprintf( shdebugstr_buf, "\n\t{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x} (%s)", + return wine_dbg_sprintf( "\n\t{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x} (%s)", id->Data1, id->Data2, id->Data3, id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7], name ? name : "unknown" ); - } - return shdebugstr_buf; } _____ Modified: trunk/reactos/lib/shell32/iconcache.c --- trunk/reactos/lib/shell32/iconcache.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/iconcache.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -67,7 +67,7 @@ { 0, 0, &SHELL32_SicCS, { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { 0, (DWORD)(__FILE__ ": SHELL32_SicCS") } + 0, 0, { (DWORD_PTR)(__FILE__ ": SHELL32_SicCS") } }; static CRITICAL_SECTION SHELL32_SicCS = { &critsect_debug, -1, 0, 0, 0, 0 }; _____ Modified: trunk/reactos/lib/shell32/pidl.c --- trunk/reactos/lib/shell32/pidl.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/pidl.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -1278,55 +1278,41 @@ */ HRESULT WINAPI SHBindToParent(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCITEMIDLIST *ppidlLast) { - IShellFolder * psf; - LPITEMIDLIST pidlChild, pidlParent; + IShellFolder * psfDesktop; HRESULT hr=E_FAIL; TRACE_(shell)("pidl=%p\n", pidl); pdump(pidl); - + + if (!pidl || !ppv) + return E_INVALIDARG; + *ppv = NULL; if (ppidlLast) *ppidlLast = NULL; + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED(hr)) + return hr; + if (_ILIsPidlSimple(pidl)) { - IShellFolder* desktop; - /* we are on desktop level */ - hr = SHGetDesktopFolder(&desktop); - - if (SUCCEEDED(hr)) - { - hr = IShellFolder_QueryInterface(desktop, riid, ppv); - - if (SUCCEEDED(hr) && ppidlLast) - *ppidlLast = ILClone(pidl); - - IShellFolder_Release(desktop); - } + hr = IShellFolder_QueryInterface(psfDesktop, riid, ppv); } else { - pidlChild = ILClone(ILFindLastID(pidl)); - pidlParent = ILClone(pidl); + LPITEMIDLIST pidlParent = ILClone(pidl); ILRemoveLastID(pidlParent); - - hr = SHGetDesktopFolder(&psf); - - if (SUCCEEDED(hr)) - hr = IShellFolder_BindToObject(psf, pidlParent, NULL, riid, ppv); - - if (SUCCEEDED(hr) && ppidlLast) - *ppidlLast = pidlChild; - else - ILFree (pidlChild); - + hr = IShellFolder_BindToObject(psfDesktop, pidlParent, NULL, riid, ppv); SHFree (pidlParent); - if (psf) - IShellFolder_Release(psf); } + IShellFolder_Release(psfDesktop); + + if (SUCCEEDED(hr) && ppidlLast) + *ppidlLast = ILFindLastID(pidl); + TRACE_(shell)("-- psf=%p pidl=%p ret=0x%08lx\n", *ppv, (ppidlLast)?*ppidlLast:NULL, hr); return hr; } _____ Modified: trunk/reactos/lib/shell32/shell.c --- trunk/reactos/lib/shell32/shell.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/shell.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -51,7 +51,6 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); -WINE_DECLARE_DEBUG_CHANNEL(exec); typedef struct { /* structure for dropped files */ _____ Modified: trunk/reactos/lib/shell32/shell32.spec --- trunk/reactos/lib/shell32/shell32.spec 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/shell32.spec 2005-10-08 17:41:41 UTC (rev 18348) @@ -120,9 +120,9 @@ 127 stdcall -noname SHWinHelp(long long long long) 129 stdcall -noname DAD_AutoScroll(long ptr ptr) 130 stdcall -noname DAD_DragEnter(long) - 131 stdcall -noname DAD_DragEnterEx(long long long) + 131 stdcall -noname DAD_DragEnterEx(long double) 132 stdcall -noname DAD_DragLeave() - 134 stdcall -noname DAD_DragMove(long long) + 134 stdcall -noname DAD_DragMove(double) 136 stdcall -noname DAD_SetDragImage(long long) 137 stdcall -noname DAD_ShowDragImage(long) 139 stub Desktop_UpdateBriefcaseOnEvent _____ Copied: trunk/reactos/lib/shell32/shell32_Bg.rc (from rev 18347, vendor/wine/dlls/shell32/current/shell32_Bg.rc) Property changes on: trunk/reactos/lib/shell32/shell32_Bg.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/shell32/shell32_Fi.rc --- trunk/reactos/lib/shell32/shell32_Fi.rc 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/shell32_Fi.rc 2005-10-08 17:41:41 UTC (rev 18348) @@ -1,5 +1,5 @@ /* - * Copyright 1998 Juergen Schmied + * Copyright 2005 Kimmo Myllyvirta * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,9 +18,95 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT +MENU_001 MENU DISCARDABLE +BEGIN + MENUITEM "&Suuret Kuvakkeet", FCIDM_SHVIEW_BIGICON + MENUITEM "&Pienet Kuvakkeet", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Tiedot", FCIDM_SHVIEW_REPORTVIEW +END + +/* + shellview background menu +*/ +MENU_002 MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&Nõkymõ" + BEGIN + MENUITEM "&Pienet Kuvakkeet", FCIDM_SHVIEW_BIGICON + MENUITEM "&Suuret Kuvakkeet", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Tiedot", FCIDM_SHVIEW_REPORTVIEW + END + MENUITEM SEPARATOR + POPUP "&Jõrjestõ Kuvakkeet" + BEGIN + MENUITEM "&Nimen mukaan", 0x30 /* column 0 */ + MENUITEM "&Tyypin mukaan", 0x32 /* column 2 */ + MENUITEM "&Koon mukaan", 0x31 /* ... */ + MENUITEM "&Põivõmõõrõn mukaan", 0x33 + MENUITEM SEPARATOR + MENUITEM "Jõrjestõ &Automaattisesti", FCIDM_SHVIEW_AUTOARRANGE + END + MENUITEM "Jõrjestõ kuvakkeet riviin", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM SEPARATOR + MENUITEM "Põivitõ", FCIDM_SHVIEW_REFRESH + MENUITEM SEPARATOR + MENUITEM "Liitõ", FCIDM_SHVIEW_INSERT + MENUITEM "Liitõ Linkiksi", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + POPUP "Uusi" + BEGIN + MENUITEM "Uusi &Kansio", FCIDM_SHVIEW_NEWFOLDER + MENUITEM "Uusi &Linkki", FCIDM_SHVIEW_NEWLINK + MENUITEM SEPARATOR + END + MENUITEM SEPARATOR + MENUITEM "Ominaisuudet", FCIDM_SHVIEW_PROPERTIES + END +END + +/* + shellview item menu +*/ +MENU_SHV_FILE MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Selaa", FCIDM_SHVIEW_EXPLORE + MENUITEM "&Avaa", FCIDM_SHVIEW_OPEN + MENUITEM SEPARATOR + MENUITEM "&Leikkaa", FCIDM_SHVIEW_CUT + MENUITEM "&Kopioi", FCIDM_SHVIEW_COPY + MENUITEM SEPARATOR + MENUITEM "Lu&o Linkki", FCIDM_SHVIEW_CREATELINK + MENUITEM "&Poista", FCIDM_SHVIEW_DELETE + MENUITEM "&Nimeõ Uudelleen", FCIDM_SHVIEW_RENAME + MENUITEM SEPARATOR + MENUITEM "&Ominaisuudet", FCIDM_SHVIEW_PROPERTIES + END +END + +SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "Valitse Kansio" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Peruuta", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP + LTEXT "", IDD_TITLE, 4, 4, 180, 12 + LTEXT "", IDD_STATUS, 4, 25, 180, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", + TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | + WS_BORDER | WS_TABSTOP, + 4, 40, 180, 120 +} + SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Tietoja: %s" +CAPTION "Tietoja %s" FONT 10, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP @@ -28,7 +114,7 @@ ICON "", 1088, 10, 10, 14, 16 LTEXT "", 100, 30, 10, 137, 10 LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ReactOS:n tekijõt:", 98, 8, 55, 137, 10 + LTEXT "ReactOS:n toi Sinulle:", 98, 8, 55, 137, 10 } SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -37,10 +123,82 @@ 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 ReactOS will open it for you.", 12289, 36, 11, 182, 18 - LTEXT "&Open:", 12305, 7, 39, 24, 10 + LTEXT "Anna ohjelma, dokumentti, tai Internet -ressurssi, ja ReactOS avaa sen Sinulle.", 12289, 36, 11, 182, 18 + LTEXT "&Avaa:", 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 "Peruuta", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "&Selaa...", 12288, 170, 63, 50, 14, WS_TABSTOP } + +STRINGTABLE DISCARDABLE +{ + /* columns in the shellview */ + IDS_SHV_COLUMN1 "Tiedosto" + IDS_SHV_COLUMN2 "Koko" + IDS_SHV_COLUMN3 "Tyyppi" + IDS_SHV_COLUMN4 "Muokattu" + IDS_SHV_COLUMN5 "Ominaisuudet" + IDS_SHV_COLUMN6 "Koko" + IDS_SHV_COLUMN7 "Tilaa jõljellõ" + IDS_SHV_COLUMN8 "Nimi" + IDS_SHV_COLUMN9 "Kommentit" + IDS_SHV_COLUMN10 "Omistaja" + IDS_SHV_COLUMN11 "Ryhmõ" + + /* special folders */ + IDS_DESKTOP "Ty÷p÷ytõ" + IDS_MYCOMPUTER "Oma Tietokone" + + /* context menus */ + IDS_VIEW_LARGE "&Suuret Kuvakkeet" + IDS_VIEW_SMALL "&Pienet Kuvakkeet" + IDS_VIEW_LIST "&Lista" + IDS_VIEW_DETAILS "&Tiedot" + IDS_SELECT "Valitse" + IDS_OPEN "Avaa" + + IDS_CREATEFOLDER_DENIED "Uutta kansiota ei voitu luoda: Oikeudet eivõt riitõ." + IDS_CREATEFOLDER_CAPTION "Virhe luotaessa uutta kansiota" + IDS_DELETEITEM_CAPTION "Vahvista tiedoston tuhoaminen" + IDS_DELETEFOLDER_CAPTION "Vahvista kansion tuhoaminen" + IDS_DELETEITEM_TEXT "Haluatko varmasti tuhota '%1':n?" + IDS_DELETEMULTIPLE_TEXT "Haluatko varmasti tuhota nõmõ %1?" + IDS_OVERWRITEFILE_TEXT "Ylikirjoita tiedosto %1?" + IDS_OVERWRITEFILE_CAPTION "Vahvista Tiedoston Ylikirjoitus" + + /* message box strings */ + IDS_RESTART_TITLE "Kõynnistõ uudestaan" + IDS_RESTART_PROMPT "Haluatko simuloida Windows:n uudelleenkõynnistõmistõ?" + IDS_SHUTDOWN_TITLE "Sammuta" + IDS_SHUTDOWN_PROMPT "Haluatko lopettaa Wine:n istunnon?" + + /* shell folder path default values */ + IDS_PROGRAMS "Kõynnistõ\\Ohjelmat" + IDS_PERSONAL "Omat tiedostot" + IDS_FAVORITES "Suosikit" + IDS_STARTUP "Kõynnistõ\\Ohjelmat\\Kõynnistys" + IDS_RECENT "?skettõin kõytetyt" + IDS_SENDTO "Lõhetõ" + IDS_STARTMENU "Kõynnistõ" + IDS_MYMUSIC "Omat tiedostot\\Omat musiikkitiedostot" + IDS_MYVIDEO "Omat tiedostot\\Omat videotiedostot" + IDS_DESKTOPDIRECTORY "Ty÷p÷ytõ" + IDS_NETHOOD "Verkkoympõrist÷" + IDS_TEMPLATES "Mallit" + IDS_APPDATA "Ohjelmien Tiedot" + IDS_PRINTHOOD "Tulostinympõrist÷" + IDS_LOCAL_APPDATA "Paikalliset Asetukset\\Ohjelmien Tiedot" + IDS_INTERNET_CACHE "Võliaikaiset Internet-tiedostot" + IDS_COOKIES "Evõsteet" + IDS_HISTORY "Historia" + IDS_PROGRAM_FILES "Ohjelmat" + IDS_MYPICTURES "Omat tiedostot\\Omat kuvatiedostot" + IDS_PROGRAM_FILES_COMMON "Ohjelmat\\Yhteiset Tiedostot" + IDS_COMMON_DOCUMENTS "Dokumentit" + IDS_ADMINTOOLS "Kõynnistys\\Ohjauspaneeli\\Administrative Tools" + IDS_COMMON_MUSIC "Dokumentit\\Omat musiikkitiedostot" + IDS_COMMON_PICTURES "Dokumentit\\Omat kuvatiedostot" + IDS_COMMON_VIDEO "Dokumentit\\Omat videotiedostot" + IDS_CDBURN_AREA "Paikalliset Asetukset\\Ohjelmien Tiedot\\Microsoft\\CD Burning" +} _____ Modified: trunk/reactos/lib/shell32/shell32_No.rc --- trunk/reactos/lib/shell32/shell32_No.rc 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/shell32_No.rc 2005-10-08 17:41:41 UTC (rev 18348) @@ -1,5 +1,5 @@ /* - * Copyright 1998 Juergen Schmied + * Copyright 2005 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 @@ -16,8 +16,94 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +MENU_001 MENU DISCARDABLE +BEGIN + MENUITEM "&Store ikoner", FCIDM_SHVIEW_BIGICON + MENUITEM "&SmÕ ikoner", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW +END + +/* + shellview background menu +*/ +MENU_002 MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&Vis" + BEGIN + MENUITEM "&Store ikoner", FCIDM_SHVIEW_BIGICON + MENUITEM "S&mÕ ikoner", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW + END + MENUITEM SEPARATOR + POPUP "Ordne &ikoner" + BEGIN + MENUITEM "Etter &navn", 0x30 /* column 0 */ + MENUITEM "Etter &type", 0x32 /* column 2 */ + MENUITEM "Etter &st°rrelse", 0x31 /* ... */ + MENUITEM "Etter &dato", 0x33 + MENUITEM SEPARATOR + MENUITEM "Ordne &automatisk", FCIDM_SHVIEW_AUTOARRANGE + END + MENUITEM "Still opp ikoner", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM SEPARATOR + MENUITEM "Oppdater", FCIDM_SHVIEW_REFRESH + MENUITEM SEPARATOR + MENUITEM "Lim inn", FCIDM_SHVIEW_INSERT + MENUITEM "Lim inn som snarvei", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + POPUP "Ny" + BEGIN + MENUITEM "Ny &mappe", FCIDM_SHVIEW_NEWFOLDER + MENUITEM "Ny &snarvei", FCIDM_SHVIEW_NEWLINK + MENUITEM SEPARATOR + END + MENUITEM SEPARATOR + MENUITEM "Egenskaper", FCIDM_SHVIEW_PROPERTIES + END +END + +/* + shellview item menu +*/ +MENU_SHV_FILE MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Utforsk", FCIDM_SHVIEW_EXPLORE + MENUITEM "&?pne", FCIDM_SHVIEW_OPEN + MENUITEM SEPARATOR + MENUITEM "Klipp &ut", FCIDM_SHVIEW_CUT + MENUITEM "&Kopier", FCIDM_SHVIEW_COPY + MENUITEM SEPARATOR + MENUITEM "&Opprett snarvei", FCIDM_SHVIEW_CREATELINK + MENUITEM "&Slett", FCIDM_SHVIEW_DELETE + MENUITEM "&Gi nytt navn", FCIDM_SHVIEW_RENAME + MENUITEM SEPARATOR + MENUITEM "Egenska&per", FCIDM_SHVIEW_PROPERTIES + END +END + +SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "Bla etter mappe" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Avbryt", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP + LTEXT "", IDD_TITLE, 4, 4, 180, 12 + LTEXT "", IDD_STATUS, 4, 25, 180, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", + TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | + WS_BORDER | WS_TABSTOP, + 4, 40, 180, 120 +} + SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Om %s" @@ -28,7 +114,7 @@ ICON "", 1088, 10, 10, 14, 16 LTEXT "", 100, 30, 10, 137, 10 LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ReactOS was brought to you by:", 98, 8, 55, 137, 10 + LTEXT "ReactOS er laget av", 98, 8, 55, 137, 10 } SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -37,10 +123,82 @@ 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 ReactOS will open it for you.", 12289, 36, 11, 182, 18 - LTEXT "&Open:", 12305, 7, 39, 24, 10 + LTEXT "Skriv inn navnet pÕ programmet, mappen, dokumentet etter Internett-ressursen du °nsker Õ Õpne.", 12289, 36, 11, 182, 18 + LTEXT "&?pne:", 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 "Avbryt", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "&Bla . . .", 12288, 170, 63, 50, 14, WS_TABSTOP } + +STRINGTABLE DISCARDABLE +{ + /* columns in the shellview */ + IDS_SHV_COLUMN1 "Fil" + IDS_SHV_COLUMN2 "St°rrelse" + IDS_SHV_COLUMN3 "Type" + IDS_SHV_COLUMN4 "Endret" + IDS_SHV_COLUMN5 "Egenskaper" + IDS_SHV_COLUMN6 "St°rrelse" + IDS_SHV_COLUMN7 "Ledig plass" + IDS_SHV_COLUMN8 "Navn" + IDS_SHV_COLUMN9 "Kommentarer" + IDS_SHV_COLUMN10 "Eier" + IDS_SHV_COLUMN11 "Gruppe" + + /* special folders */ + IDS_DESKTOP "Skrivebord" + IDS_MYCOMPUTER "Min datamaskin" + + /* context menus */ + IDS_VIEW_LARGE "&Store ikoner" + IDS_VIEW_SMALL "S&mÕ ikoner" + IDS_VIEW_LIST "&Liste" + IDS_VIEW_DETAILS "&Detaljer" + IDS_SELECT "Velg" + IDS_OPEN "?pne" + + IDS_CREATEFOLDER_DENIED "Kunne ikke opprette ny mappe: tilgang nektet." + IDS_CREATEFOLDER_CAPTION "Feil ved oppretting av ny mappe" + IDS_DELETEITEM_CAPTION "Bekreft filsletting" + IDS_DELETEFOLDER_CAPTION "Bekreft sletting av mappe" + IDS_DELETEITEM_TEXT "Virkelig slette '%1'?" + IDS_DELETEMULTIPLE_TEXT "Virkelig slette disse %1 elementene?" + IDS_OVERWRITEFILE_TEXT "Overskrive filen '%1'?" + IDS_OVERWRITEFILE_CAPTION "Bekreft overskriving av fil" + + /* message box strings */ + IDS_RESTART_TITLE "Starte pÕ nytt" + IDS_RESTART_PROMPT "Vil du simulere en omstart av Windows?" + IDS_SHUTDOWN_TITLE "Avslutt" + IDS_SHUTDOWN_PROMPT "Vil du avslutte Wine-°kten?" + + /* shell folder path default values */ + IDS_PROGRAMS "Start-meny\\Programmer" + IDS_PERSONAL "Mine dokumenter" + IDS_FAVORITES "Favoritter" + IDS_STARTUP "Start-meny\\Programmer\\Oppstart" + IDS_RECENT "Recent" + IDS_SENDTO "SendTo" + IDS_STARTMENU "Start-meny" + IDS_MYMUSIC "Mine dokumenter\\Min musikk" + IDS_MYVIDEO "Mine dokumenter\\Mine videoklipp" + IDS_DESKTOPDIRECTORY "Skrivebord" + IDS_NETHOOD "NetHood" + IDS_TEMPLATES "Templates" + IDS_APPDATA "Application Data" + IDS_PRINTHOOD "PrintHood" + IDS_LOCAL_APPDATA "Local Settings\\Application Data" + IDS_INTERNET_CACHE "Temporary Internet Files" + IDS_COOKIES "Cookies" + IDS_HISTORY "History" + IDS_PROGRAM_FILES "Program Files" + IDS_MYPICTURES "Mine dokumenter\\Mine bilder" + IDS_PROGRAM_FILES_COMMON "Programfiler\\Fellesfiler" + IDS_COMMON_DOCUMENTS "Dokumenter" + IDS_ADMINTOOLS "Start-meny\\Programmer\\Administrative verkt°y" + IDS_COMMON_MUSIC "Dokumenter\\Min musikk" + IDS_COMMON_PICTURES "Dokumenter\\Mine bilder" + IDS_COMMON_VIDEO "Dokumenter\\Mine videoklipp" + IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" +} _____ Modified: trunk/reactos/lib/shell32/shell32_main.c --- trunk/reactos/lib/shell32/shell32_main.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/shell32_main.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -308,12 +308,13 @@ * SHGetFileInfoW [SHELL32.@] * */ -DWORD WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, - SHFILEINFOW *psfi, UINT sizeofpsfi, UINT flags ) +DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, + SHFILEINFOW *psfi, UINT sizeofpsfi, UINT flags ) { WCHAR szLocation[MAX_PATH], szFullPath[MAX_PATH]; int iIndex; - DWORD ret = TRUE, dwAttributes = 0; + DWORD_PTR ret = TRUE; + DWORD dwAttributes = 0; IShellFolder * psfParent = NULL; IExtractIconW * pei = NULL; LPITEMIDLIST pidlLast = NULL, pidl = NULL; @@ -557,9 +558,9 @@ if (ret) { if (flags & SHGFI_SMALLICON) - ret = (DWORD) ShellSmallIconList; + ret = (DWORD_PTR) ShellSmallIconList; else - ret = (DWORD) ShellBigIconList; + ret = (DWORD_PTR) ShellBigIconList; } } @@ -596,9 +597,9 @@ /*********************************************************************** ** * SHGetFileInfoA [SHELL32.@] */ -DWORD WINAPI SHGetFileInfoA(LPCSTR path,DWORD dwFileAttributes, - SHFILEINFOA *psfi, UINT sizeofpsfi, - UINT flags ) +DWORD_PTR WINAPI SHGetFileInfoA(LPCSTR path,DWORD dwFileAttributes, + SHFILEINFOA *psfi, UINT sizeofpsfi, + UINT flags ) { INT len; LPWSTR temppath; @@ -706,7 +707,7 @@ { ret = PrivateExtractIconsW(lpszFile, 0, cx, cy, NULL, NULL, 0, LR_DEFAULTCOLOR); if (ret != 0xFFFFFFFF && ret) - return (HICON)ret; + return (HICON)(UINT_PTR)ret; return NULL; } else _____ Modified: trunk/reactos/lib/shell32/shelllink.c --- trunk/reactos/lib/shell32/shelllink.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/shelllink.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -2384,7 +2384,7 @@ } static HRESULT WINAPI -ShellLink_GetCommandString( IContextMenu* iface, UINT idCmd, UINT uType, +ShellLink_GetCommandString( IContextMenu* iface, UINT_PTR idCmd, UINT uType, UINT* pwReserved, LPSTR pszName, UINT cchMax ) { IShellLinkImpl *This = impl_from_IContextMenu(iface); _____ Modified: trunk/reactos/lib/shell32/shellord.c --- trunk/reactos/lib/shell32/shellord.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/shellord.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -355,16 +355,16 @@ va_start(args, uType); /* wvsprintfA(buf,fmt, args); */ - TRACE("(%08lx,%08lx,%p,%p,%08x)\n", - (DWORD)hInstance,(DWORD)hWnd,lpText,lpCaption,uType); + TRACE("(%p,%p,%p,%p,%08x)\n", + hInstance,hWnd,lpText,lpCaption,uType); - if (!HIWORD(lpCaption)) - LoadStringW(hInstance, (DWORD)lpCaption, szTitle, sizeof(szTitle)/sizeof(szTitle[0])); + if (IS_INTRESOURCE(lpCaption)) + LoadStringW(hInstance, LOWORD(lpCaption), szTitle, sizeof(szTitle)/sizeof(szTitle[0])); else pszTitle = lpCaption; - if (!HIWORD(lpText)) - LoadStringW(hInstance, (DWORD)lpText, szText, sizeof(szText)/sizeof(szText[0])); + if (IS_INTRESOURCE(lpText)) + LoadStringW(hInstance, LOWORD(lpText), szText, sizeof(szText)/sizeof(szText[0])); else pszText = lpText; @@ -412,16 +412,16 @@ va_start(args, uType); /* wvsprintfA(buf,fmt, args); */ - TRACE("(%08lx,%08lx,%p,%p,%08x)\n", - (DWORD)hInstance,(DWORD)hWnd,lpText,lpCaption,uType); + TRACE("(%p,%p,%p,%p,%08x)\n", + hInstance,hWnd,lpText,lpCaption,uType); - if (!HIWORD(lpCaption)) - LoadStringA(hInstance, (DWORD)lpCaption, szTitle, sizeof(szTitle)); + if (IS_INTRESOURCE(lpCaption)) + LoadStringA(hInstance, LOWORD(lpCaption), szTitle, sizeof(szTitle)); else pszTitle = lpCaption; - if (!HIWORD(lpText)) - LoadStringA(hInstance, (DWORD)lpText, szText, sizeof(szText)); + if (IS_INTRESOURCE(lpText)) + LoadStringA(hInstance, LOWORD(lpText), szText, sizeof(szText)); else pszText = lpText; @@ -1004,10 +1004,9 @@ * NOTES * Sets the interface */ -HRESULT WINAPI SHSetInstanceExplorer (LPUNKNOWN lpUnknown) +VOID WINAPI SHSetInstanceExplorer (LPUNKNOWN lpUnknown) { TRACE("%p\n", lpUnknown); SHELL32_IExplorerInterface = lpUnknown; - return (HRESULT) lpUnknown; } /*********************************************************************** ** * SHGetInstanceExplorer [SHELL32.@] _____ Modified: trunk/reactos/lib/shell32/shellpath.c --- trunk/reactos/lib/shell32/shellpath.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/shellpath.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -1303,7 +1303,7 @@ IS_INTRESOURCE(CSIDL_Data[folder].szDefaultPath)) { if (LoadStringW(shell32_hInstance, - (UINT)CSIDL_Data[folder].szDefaultPath, resourcePath, MAX_PATH)) + LOWORD(CSIDL_Data[folder].szDefaultPath), resourcePath, MAX_PATH)) { hr = S_OK; pDefaultPath = resourcePath; _____ Modified: trunk/reactos/lib/shell32/shlexec.c --- trunk/reactos/lib/shell32/shlexec.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/shlexec.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -928,7 +928,7 @@ if (wDirectory) SHFree( wDirectory ); TRACE("returning %s\n", lpResult); - return (HINSTANCE)retval; + return retval; } /*********************************************************************** ** @@ -1051,7 +1051,7 @@ if (SUCCEEDED(hr)) { - hr = IShellExecuteHookW_Execute(pSEH, sei); + hr = IShellExecuteHookW_Execute(pSEH, &sei_tmp); IShellExecuteHookW_Release(pSEH); @@ -1151,7 +1151,7 @@ if (SUCCEEDED(hr)) { - hr = IShellExecuteHookW_Execute(pSEH, sei); + hr = IShellExecuteHookW_Execute(pSEH, &sei_tmp); IShellExecuteHookW_Release(pSEH); @@ -1338,7 +1338,7 @@ WCHAR lpstrTmpFile[256]; strcpyW(lpstrTmpFile, wHttp); strcatW(lpstrTmpFile, lpFile); - retval = (UINT)ShellExecuteW(sei_tmp.hwnd, sei_tmp.lpVerb, lpstrTmpFile, NULL, NULL, 0); + retval = (UINT_PTR)ShellExecuteW(sei_tmp.hwnd, sei_tmp.lpVerb, lpstrTmpFile, NULL, NULL, 0); } TRACE("retval %u\n", retval); _____ Modified: trunk/reactos/lib/shell32/shlmenu.c --- trunk/reactos/lib/shell32/shlmenu.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/shlmenu.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -206,7 +206,7 @@ MenuInfo.cbSize = sizeof(MENUINFO); MenuInfo.fMask = MIM_MENUDATA; - MenuInfo.dwMenuData = (DWORD) lpFmMi; + MenuInfo.dwMenuData = (ULONG_PTR) lpFmMi; SetMenuInfo (hMenuPopup, &MenuInfo); FileMenu_AppendItemW (hmenu, sTemp, uID, iIcon, hMenuPopup, FM_DEFAULT_HEIGHT); @@ -277,7 +277,7 @@ MenuInfo.cbSize = sizeof(MENUINFO); MenuInfo.fMask = MIM_MENUDATA; - MenuInfo.dwMenuData = (DWORD) menudata; + MenuInfo.dwMenuData = (ULONG_PTR) menudata; SetMenuInfo (hMenu, &MenuInfo); return hMenu; @@ -342,7 +342,7 @@ myItem->iIconIndex = icon; myItem->hMenu = hMenu; mii.fMask = MIIM_DATA; - mii.dwItemData = (DWORD) myItem; + mii.dwItemData = (ULONG_PTR) myItem; } if ( hMenuPopup ) _____ Modified: trunk/reactos/lib/shell32/shres.rc --- trunk/reactos/lib/shell32/shres.rc 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/shres.rc 2005-10-08 17:41:41 UTC (rev 18348) @@ -24358,6 +24358,7 @@ * which also have a neutral version. This is to * get localized bitmaps for example. */ +#include "shell32_Bg.rc" #include "shell32_Ca.rc" #include "shell32_Cn.rc" #include "shell32_Cs.rc" _____ Modified: trunk/reactos/lib/shell32/shv_bg_cmenu.c --- trunk/reactos/lib/shell32/shv_bg_cmenu.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/shv_bg_cmenu.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -400,7 +400,7 @@ */ static HRESULT WINAPI ISVBgCm_fnGetCommandString( IContextMenu2 *iface, - UINT idCommand, + UINT_PTR idCommand, UINT uFlags, UINT* lpReserved, LPSTR lpszName, _____ Modified: trunk/reactos/lib/shell32/shv_item_cmenu.c --- trunk/reactos/lib/shell32/shv_item_cmenu.c 2005-10-08 17:26:40 UTC (rev 18347) +++ trunk/reactos/lib/shell32/shv_item_cmenu.c 2005-10-08 17:41:41 UTC (rev 18348) @@ -467,7 +467,7 @@ */ static HRESULT WINAPI ISvItemCm_fnGetCommandString( IContextMenu2 *iface, - UINT idCommand, + UINT_PTR idCommand, UINT uFlags, UINT* lpReserved, LPSTR lpszName,

19 years, 2 months

[gvg] 18347: Sync to Wine-20050930:

by gvg＠svn.reactos.com

Sync to Wine-20050930: Robert Shearman <rob(a)codeweavers.com> - Implement most of the details around unmarshalling of an object pointer. - Fix allocation scheme in NdrConformantArrayUnmarshal to allocate if *ppMemory is NULL, like complex struct and user type unmarshalling. - Fix ref-counting rules to match native DCOM Dlls. Alexandre Julliard <julliard(a)winehq.org> - Use a more portable scheme for storing the name of a critical section. - We are no longer generating .dbg.c files. Mike McCormack <mike(a)codeweavers.com> - Fix gcc 4.0 warnings. Modified: trunk/reactos/lib/rpcrt4/cproxy.c Modified: trunk/reactos/lib/rpcrt4/ndr_marshall.c Modified: trunk/reactos/lib/rpcrt4/ndr_ole.c Modified: trunk/reactos/lib/rpcrt4/rpc_binding.c Modified: trunk/reactos/lib/rpcrt4/rpc_server.c Modified: trunk/reactos/lib/rpcrt4/rpcrt4.rc Modified: trunk/reactos/lib/rpcrt4/rpcrt4_main.c _____ Modified: trunk/reactos/lib/rpcrt4/cproxy.c --- trunk/reactos/lib/rpcrt4/cproxy.c 2005-10-08 17:25:32 UTC (rev 18346) +++ trunk/reactos/lib/rpcrt4/cproxy.c 2005-10-08 17:26:40 UTC (rev 18347) @@ -176,8 +176,8 @@ This->PVtbl = vtbl->Vtbl; This->lpVtbl = &StdProxy_Vtbl; - /* 1 reference for the proxy and 1 for the object */ - This->RefCount = 2; + /* one reference for the proxy */ + This->RefCount = 1; This->stubless = stubless; This->piid = vtbl->header.piid; This->pUnkOuter = pUnkOuter; @@ -186,6 +186,7 @@ This->pChannel = NULL; *ppProxy = (LPRPCPROXYBUFFER)&This->lpVtbl; *ppvObj = &This->PVtbl; + IUnknown_AddRef((IUnknown *)*ppvObj); IPSFactoryBuffer_AddRef(pPSFactory); return S_OK; _____ Modified: trunk/reactos/lib/rpcrt4/ndr_marshall.c --- trunk/reactos/lib/rpcrt4/ndr_marshall.c 2005-10-08 17:25:32 UTC (rev 18346) +++ trunk/reactos/lib/rpcrt4/ndr_marshall.c 2005-10-08 17:26:40 UTC (rev 18347) @@ -738,6 +738,11 @@ pStubMsg->Buffer += 4; break; case RPC_FC_OP: /* object pointer - we must free data before overwriting it */ + pointer_id = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer); + pStubMsg->Buffer += 4; + if (*pPointer) + FIXME("free object pointer %p\n", *pPointer); + break; case RPC_FC_FP: default: FIXME("unhandled ptr type=%02x\n", type); @@ -1865,19 +1870,11 @@ pFormat = ReadConformance(pStubMsg, pFormat+4); size = pStubMsg->MaxCount; - if (fMustAlloc) { + if (fMustAlloc || !*ppMemory) *ppMemory = NdrAllocate(pStubMsg, size*esize); - memcpy(*ppMemory, pStubMsg->Buffer, size*esize); - } else { - if (pStubMsg->ReuseBuffer && !*ppMemory) - /* for servers, we may just point straight into the RPC buffer, I think - * (I guess that's what MS does since MIDL code doesn't try to free) */ - *ppMemory = pStubMsg->Buffer; - else - /* for clients, memory should be provided by caller */ - memcpy(*ppMemory, pStubMsg->Buffer, size*esize); - } + memcpy(*ppMemory, pStubMsg->Buffer, size*esize); + pStubMsg->BufferMark = pStubMsg->Buffer; pStubMsg->Buffer += size*esize; _____ Modified: trunk/reactos/lib/rpcrt4/ndr_ole.c --- trunk/reactos/lib/rpcrt4/ndr_ole.c 2005-10-08 17:25:32 UTC (rev 18346) +++ trunk/reactos/lib/rpcrt4/ndr_ole.c 2005-10-08 17:26:40 UTC (rev 18347) @@ -113,7 +113,7 @@ RpcStreamImpl *This = (RpcStreamImpl *)iface; if (!--(This->RefCount)) { TRACE("size=%ld\n", *This->size); - This->pMsg->Buffer = This->data + *This->size; + This->pMsg->Buffer = (unsigned char*)This->data + *This->size; HeapFree(GetProcessHeap(),0,This); return 0; } _____ Modified: trunk/reactos/lib/rpcrt4/rpc_binding.c --- trunk/reactos/lib/rpcrt4/rpc_binding.c 2005-10-08 17:25:32 UTC (rev 18346) +++ trunk/reactos/lib/rpcrt4/rpc_binding.c 2005-10-08 17:26:40 UTC (rev 18347) @@ -604,39 +604,39 @@ LPSTR data; TRACE( "(%s,%s,%s,%s,%s,%p)\n", - debugstr_a( ObjUuid ), debugstr_a( Protseq ), - debugstr_a( NetworkAddr ), debugstr_a( Endpoint ), - debugstr_a( Options ), StringBinding ); + debugstr_a( (char*)ObjUuid ), debugstr_a( (char*)Protseq ), + debugstr_a( (char*)NetworkAddr ), debugstr_a( (char*)Endpoint ), + debugstr_a( (char*)Options ), StringBinding ); - if (ObjUuid && *ObjUuid) len += strlen(ObjUuid) + 1; - if (Protseq && *Protseq) len += strlen(Protseq) + 1; - if (NetworkAddr && *NetworkAddr) len += strlen(NetworkAddr); - if (Endpoint && *Endpoint) len += strlen(Endpoint) + 2; - if (Options && *Options) len += strlen(Options) + 2; + if (ObjUuid && *ObjUuid) len += strlen((char*)ObjUuid) + 1; + if (Protseq && *Protseq) len += strlen((char*)Protseq) + 1; + if (NetworkAddr && *NetworkAddr) len += strlen((char*)NetworkAddr); + if (Endpoint && *Endpoint) len += strlen((char*)Endpoint) + 2; + if (Options && *Options) len += strlen((char*)Options) + 2; data = HeapAlloc(GetProcessHeap(), 0, len); - *StringBinding = data; + *StringBinding = (unsigned char*)data; if (ObjUuid && *ObjUuid) { - data += RPCRT4_strcopyA(data, ObjUuid); + data += RPCRT4_strcopyA(data, (char*)ObjUuid); *data++ = '@'; } if (Protseq && *Protseq) { - data += RPCRT4_strcopyA(data, Protseq); + data += RPCRT4_strcopyA(data, (char*)Protseq); *data++ = ':'; } if (NetworkAddr && *NetworkAddr) - data += RPCRT4_strcopyA(data, NetworkAddr); + data += RPCRT4_strcopyA(data, (char*)NetworkAddr); if ((Endpoint && *Endpoint) || (Options && *Options)) { *data++ = '['; if (Endpoint && *Endpoint) { - data += RPCRT4_strcopyA(data, Endpoint); + data += RPCRT4_strcopyA(data, (char*)Endpoint); if (Options && *Options) *data++ = ','; } if (Options && *Options) { - data += RPCRT4_strcopyA(data, Options); + data += RPCRT4_strcopyA(data, (char*)Options); } *data++ = ']'; } @@ -708,7 +708,7 @@ CHAR *data, *next; static const char ep_opt[] = "endpoint="; - TRACE("(%s,%p,%p,%p,%p,%p)\n", debugstr_a(StringBinding), + TRACE("(%s,%p,%p,%p,%p,%p)\n", debugstr_a((char*)StringBinding), ObjUuid, Protseq, NetworkAddr, Endpoint, Options); if (ObjUuid) *ObjUuid = NULL; @@ -717,17 +717,17 @@ if (Endpoint) *Endpoint = NULL; if (Options) *Options = NULL; - data = StringBinding; + data = (char*) StringBinding; next = strchr(data, '@'); if (next) { - if (ObjUuid) *ObjUuid = RPCRT4_strndupA(data, next - data); + if (ObjUuid) *ObjUuid = (unsigned char*)RPCRT4_strndupA(data, next - data); data = next+1; } next = strchr(data, ':'); if (next) { - if (Protseq) *Protseq = RPCRT4_strndupA(data, next - data); + if (Protseq) *Protseq = (unsigned char*)RPCRT4_strndupA(data, next - data); data = next+1; } @@ -735,7 +735,7 @@ if (next) { CHAR *close, *opt; - if (NetworkAddr) *NetworkAddr = RPCRT4_strndupA(data, next - data); + if (NetworkAddr) *NetworkAddr = (unsigned char*)RPCRT4_strndupA(data, next - data); data = next+1; close = strchr(data, ']'); if (!close) goto fail; @@ -753,21 +753,21 @@ if (!next) { /* not an option, must be an endpoint */ if (*Endpoint) goto fail; - *Endpoint = opt; + *Endpoint = (unsigned char*) opt; } else { if (strncmp(opt, ep_opt, strlen(ep_opt)) == 0) { /* endpoint option */ if (*Endpoint) goto fail; - *Endpoint = RPCRT4_strdupA(next+1); + *Endpoint = (unsigned char*) RPCRT4_strdupA(next+1); HeapFree(GetProcessHeap(), 0, opt); } else { /* network option */ if (*Options) { /* FIXME: this is kind of inefficient */ - *Options = RPCRT4_strconcatA(*Options, opt); + *Options = (unsigned char*) RPCRT4_strconcatA( (char*)*Options, opt); HeapFree(GetProcessHeap(), 0, opt); } else - *Options = opt; + *Options = (unsigned char*) opt; } } } @@ -776,7 +776,7 @@ if (*data) goto fail; } else if (NetworkAddr) - *NetworkAddr = RPCRT4_strdupA(data); + *NetworkAddr = (unsigned char*)RPCRT4_strdupA(data); return RPC_S_OK; @@ -942,7 +942,7 @@ unsigned char *ObjectUuid, *Protseq, *NetworkAddr, *Endpoint, *Options; UUID Uuid; - TRACE("(%s,%p)\n", debugstr_a(StringBinding), Binding); + TRACE("(%s,%p)\n", debugstr_a((char*)StringBinding), Binding); ret = RpcStringBindingParseA(StringBinding, &ObjectUuid, &Protseq, &NetworkAddr, &Endpoint, &Options); @@ -951,11 +951,11 @@ ret = UuidFromStringA(ObjectUuid, &Uuid); if (ret == RPC_S_OK) - ret = RPCRT4_CreateBindingA(&bind, FALSE, Protseq); + ret = RPCRT4_CreateBindingA(&bind, FALSE, (char*)Protseq); if (ret == RPC_S_OK) ret = RPCRT4_SetBindingObject(bind, &Uuid); if (ret == RPC_S_OK) - ret = RPCRT4_CompleteBindingA(bind, NetworkAddr, Endpoint, Options); + ret = RPCRT4_CompleteBindingA(bind, (char*)NetworkAddr, (char*)Endpoint, (char*)Options); RpcStringFreeA((unsigned char**)&Options); RpcStringFreeA((unsigned char**)&Endpoint); @@ -1024,8 +1024,8 @@ ret = UuidToStringA(&bind->ObjectUuid, (unsigned char**)&ObjectUuid); if (ret != RPC_S_OK) return ret; - ret = RpcStringBindingComposeA(ObjectUuid, bind->Protseq, bind->NetworkAddr, - bind->Endpoint, NULL, StringBinding); + ret = RpcStringBindingComposeA((unsigned char*) ObjectUuid, (unsigned char*)bind->Protseq, (unsigned char*) bind->NetworkAddr, + (unsigned char*) bind->Endpoint, NULL, StringBinding); RpcStringFreeA((unsigned char**)&ObjectUuid); @@ -1041,7 +1041,7 @@ unsigned char *str = NULL; TRACE("(%p,%p)\n", Binding, StringBinding); ret = RpcBindingToStringBindingA(Binding, &str); - *StringBinding = RPCRT4_strdupAtoW(str); + *StringBinding = RPCRT4_strdupAtoW((char*)str); RpcStringFreeA((unsigned char**)&str); return ret; } @@ -1071,7 +1071,7 @@ if (!protseq) return RPC_S_INVALID_RPC_PROTSEQ; /* ? */ - if (RtlCreateUnicodeStringFromAsciiz(&protseqW, protseq)) { + if (RtlCreateUnicodeStringFromAsciiz(&protseqW, (char*)protseq)) { RPC_STATUS ret = RpcNetworkIsProtseqValidW(protseqW.Buffer); RtlFreeUnicodeString(&protseqW); return ret; _____ Modified: trunk/reactos/lib/rpcrt4/rpc_server.c --- trunk/reactos/lib/rpcrt4/rpc_server.c 2005-10-08 17:25:32 UTC (rev 18346) +++ trunk/reactos/lib/rpcrt4/rpc_server.c 2005-10-08 17:26:40 UTC (rev 18347) @@ -78,7 +78,7 @@ { 0, 0, &server_cs, { &server_cs_debug.ProcessLocksList, &server_cs_debug.ProcessLocksList }, - 0, 0, { 0, (DWORD)(__FILE__ ": server_cs") } + 0, 0, { (DWORD_PTR)(__FILE__ ": server_cs") } }; static CRITICAL_SECTION server_cs = { &server_cs_debug, -1, 0, 0, 0, 0 }; @@ -87,7 +87,7 @@ { 0, 0, &listen_cs, { &listen_cs_debug.ProcessLocksList, &listen_cs_debug.ProcessLocksList }, - 0, 0, { 0, (DWORD)(__FILE__ ": listen_cs") } + 0, 0, { (DWORD_PTR)(__FILE__ ": listen_cs") } }; static CRITICAL_SECTION listen_cs = { &listen_cs_debug, -1, 0, 0, 0, 0 }; @@ -109,7 +109,7 @@ { 0, 0, &spacket_cs, { &spacket_cs_debug.ProcessLocksList, &spacket_cs_debug.ProcessLocksList }, - 0, 0, { 0, (DWORD)(__FILE__ ": spacket_cs") } + 0, 0, { (DWORD_PTR)(__FILE__ ": spacket_cs") } }; static CRITICAL_SECTION spacket_cs = { &spacket_cs_debug, -1, 0, 0, 0, 0 }; _____ Modified: trunk/reactos/lib/rpcrt4/rpcrt4.rc --- trunk/reactos/lib/rpcrt4/rpcrt4.rc 2005-10-08 17:25:32 UTC (rev 18346) +++ trunk/reactos/lib/rpcrt4/rpcrt4.rc 2005-10-08 17:26:40 UTC (rev 18347) @@ -1,7 +1,7 @@ -#include <windows.h> - -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS RPC server API\0" -#define REACTOS_STR_INTERNAL_NAME "rpcrt4\0" -#define REACTOS_STR_ORIGINAL_FILENAME "rpcrt4.dll\0" -#include <reactos/version.rc> +#include <windows.h> + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS RPC server API\0" +#define REACTOS_STR_INTERNAL_NAME "rpcrt4\0" +#define REACTOS_STR_ORIGINAL_FILENAME "rpcrt4.dll\0" +#include <reactos/version.rc> Property changes on: trunk/reactos/lib/rpcrt4/rpcrt4.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/rpcrt4/rpcrt4_main.c --- trunk/reactos/lib/rpcrt4/rpcrt4_main.c 2005-10-08 17:25:32 UTC (rev 18346) +++ trunk/reactos/lib/rpcrt4/rpcrt4_main.c 2005-10-08 17:26:40 UTC (rev 18347) @@ -129,7 +129,7 @@ { 0, 0, &uuid_cs, { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { 0, (DWORD)(__FILE__ ": uuid_cs") } + 0, 0, { (DWORD_PTR)(__FILE__ ": uuid_cs") } }; static CRITICAL_SECTION uuid_cs = { &critsect_debug, -1, 0, 0, 0, 0 };

19 years, 2 months

[mf] 18346: merge command line parser code from trunk into lean-explorer branch

by mf＠svn.reactos.com

merge command line parser code from trunk into lean-explorer branch Modified: branches/lean-explorer/reactos/subsys/system/explorer/explorer.cpp Modified: branches/lean-explorer/reactos/subsys/system/explorer/explorer.h Modified: branches/lean-explorer/reactos/subsys/system/explorer/explorer_intres.rc Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/mainframe.cp p Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/mainframe.h Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .cpp _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/explorer.cpp --- branches/lean-explorer/reactos/subsys/system/explorer/explorer.cpp 2005-10-08 17:17:27 UTC (rev 18345) +++ branches/lean-explorer/reactos/subsys/system/explorer/explorer.cpp 2005-10-08 17:25:32 UTC (rev 18346) @@ -419,8 +419,10 @@ #ifndef ROSSHELL -void explorer_show_frame(int cmdshow, LPTSTR lpCmdLine) +void explorer_show_frame(int cmdShow, LPTSTR lpCmdLine) { + ExplorerCmd cmd; + if (g_Globals._hMainWnd) { if (IsIconic(g_Globals._hMainWnd)) ShowWindow(g_Globals._hMainWnd, SW_RESTORE); @@ -438,36 +440,122 @@ if (hMainFrame) { g_Globals._hMainWnd = hMainFrame; - ShowWindow(hMainFrame, cmdshow); + ShowWindow(hMainFrame, cmdShow); UpdateWindow(hMainFrame); bool valid_dir = false; - if (lpCmdLine) { - DWORD attribs = GetFileAttributes(lpCmdLine); + cmd._cmdShow = cmdShow; - if (attribs!=INVALID_FILE_ATTRIBUTES && (attribs&FILE_ATTRIBUTE_DIRECTORY)) - valid_dir = true; - else if (*lpCmdLine==':' || *lpCmdLine=='"') - valid_dir = true; - } + // parse command line options + cmd.ParseCmdLine(lpCmdLine); // Open the first child window after initializing the application - if (valid_dir) - PostMessage(hMainFrame, PM_OPEN_WINDOW, 0, (LPARAM)lpCmdLine); + if (cmd.IsValidPath()) + PostMessage(hMainFrame, PM_OPEN_WINDOW, cmd._flags, (LPARAM)lpCmdLine); else PostMessage(hMainFrame, PM_OPEN_WINDOW, 0/*OWM_EXPLORE|OWM_DETAILS*/, 0); } } +bool ExplorerCmd::ParseCmdLine(LPCTSTR lpCmdLine) +{ + bool ok = true; + + LPCTSTR b = lpCmdLine; + LPCTSTR p = b; + + while(*b) { + // remove leading space + while(_istspace((unsigned)*b)) + ++b; + + p = b; + + bool quote = false; + + // options are separated by ',' + for(; *p; ++p) { + if (*p == '"') // Quote characters may appear at any position in the command line. + quote = !quote; + else if (*p==',' && !quote) + break; + } + + if (p > b) { + int l = p - b; + + // remove trailing space + while(l>0 && _istspace((unsigned)b[l-1])) + --l; + + if (!EvaluateOption(String(b, l))) + ok = false; + + if (*p) + ++p; + + b = p; + } + } + + return ok; +} + +bool ExplorerCmd::EvaluateOption(LPCTSTR option) +{ + String opt_str; + + // Remove quote characters, as they are evaluated at this point. + for(; *option; ++option) + if (*option != '"') + opt_str += *option; + + option = opt_str; + + if (option[0] == '/') { + ++option; + + // option /e for windows in explorer mode + if (!_tcsicmp(option, TEXT("e"))) + _flags |= OWM_EXPLORE; + // option /root for rooted explorer windows + else if (!_tcsicmp(option, TEXT("root"))) + _flags |= OWM_ROOTED; + else + return false; + } else { + if (!_path.empty()) + return false; + + _path = opt_str; + } + + return true; +} + +bool ExplorerCmd::IsValidPath() const +{ + if (!_path.empty()) { + DWORD attribs = GetFileAttributes(_path); + + if (attribs!=INVALID_FILE_ATTRIBUTES && (attribs&FILE_ATTRIBUTE_DIRECTORY)) + return true; // file system path + else if (*_path==':' && _path.at(1)==':') + return true; // text encoded IDL + } + + return false; +} + #else -void explorer_show_frame(int cmdshow, LPTSTR lpCmdLine) +void explorer_show_frame(int cmdShow, LPTSTR lpCmdLine) { if (!lpCmdLine) lpCmdLine = TEXT("explorer.exe"); - launch_file(GetDesktopWindow(), lpCmdLine, cmdshow); + launch_file(GetDesktopWindow(), lpCmdLine, cmdShow); } #endif @@ -567,7 +655,7 @@ } -int explorer_main(HINSTANCE hInstance, LPTSTR lpCmdLine, int cmdshow) +int explorer_main(HINSTANCE hInstance, LPTSTR lpCmdLine, int cmdShow) { CONTEXT("explorer_main"); @@ -582,14 +670,14 @@ } #ifndef ROSSHELL - if (cmdshow != SW_HIDE) { + if (cmdShow != SW_HIDE) { /* // don't maximize if being called from the ROS desktop - if (cmdshow == SW_SHOWNORMAL) + if (cmdShow == SW_SHOWNORMAL) ///@todo read window placement from registry - cmdshow = SW_MAXIMIZE; + cmdShow = SW_MAXIMIZE; */ - explorer_show_frame(cmdshow, lpCmdLine); + explorer_show_frame(cmdShow, lpCmdLine); } #endif @@ -617,9 +705,12 @@ LPWSTR cmdline = GetCommandLineW(); - while(*cmdline && !_istspace(*cmdline)) + while(*cmdline && !_istspace((unsigned)*cmdline)) ++cmdline; + while(_istspace((unsigned)*cmdline)) + ++cmdline; + return wWinMain(GetModuleHandle(NULL), 0, cmdline, nShowCmd); } @@ -647,8 +738,19 @@ BOOL startup_desktop; + // strip extended options from the front of the command line + String ext_options; + + while(*lpCmdLine == '-') { + while(*lpCmdLine && !_istspace((unsigned)*lpCmdLine)) + ext_options += *lpCmdLine++; + + while(_istspace((unsigned)*lpCmdLine)) + ++lpCmdLine; + } + // command line option "-install" to replace previous shell application with ROS Explorer - if (_tcsstr(lpCmdLine,TEXT("-install"))) { + if (_tcsstr(ext_options,TEXT("-install"))) { // install ROS Explorer into the registry TCHAR path[MAX_PATH]; @@ -704,19 +806,21 @@ #endif // If there is given the command line option "-desktop", create desktop window anyways - if (_tcsstr(lpCmdLine,TEXT("-desktop"))) + if (_tcsstr(ext_options,TEXT("-desktop"))) startup_desktop = TRUE; #ifndef ROSSHELL - else if (_tcsstr(lpCmdLine,TEXT("-nodesktop"))) + else if (_tcsstr(ext_options,TEXT("-nodesktop"))) startup_desktop = FALSE; // Don't display cabinet window in desktop mode - if (startup_desktop && !_tcsstr(lpCmdLine,TEXT("-explorer"))) + if (startup_desktop && !_tcsstr(ext_options,TEXT("-explorer"))) nShowCmd = SW_HIDE; #endif - if (_tcsstr(lpCmdLine,TEXT("-noautostart"))) + if (_tcsstr(ext_options,TEXT("-noautostart"))) autostart = false; + else if (_tcsstr(ext_options,TEXT("-autostart"))) + autostart = true; if (startup_desktop) { // hide the XP login screen (Credit to Nicolas Escuder) @@ -752,12 +856,6 @@ } #ifndef ROSSHELL - /**TODO fix command line handling */ - if (*lpCmdLine=='"' && lpCmdLine[_tcslen(lpCmdLine)-1]=='"') { - ++lpCmdLine; - lpCmdLine[_tcslen(lpCmdLine)-1] = '\0'; - } - if (g_Globals._hwndDesktop) g_Globals._desktop_mode = true; #endif _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/explorer.h --- branches/lean-explorer/reactos/subsys/system/explorer/explorer.h 2005-10-08 17:17:27 UTC (rev 18345) +++ branches/lean-explorer/reactos/subsys/system/explorer/explorer.h 2005-10-08 17:25:32 UTC (rev 18346) @@ -55,6 +55,39 @@ #include "shell/shellbrowser.h" + #ifndef ROSSHELL + + /// Explorer command line parser + // for commands like "/e,/root,c:\" + // or "::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\::{21EC2020-3AEA-1069-A2DD-080 02B30309D}" (launch of control panel) +struct ExplorerCmd +{ + ExplorerCmd() + : _flags(0), + _cmdShow(SW_SHOWNORMAL), + _valid_path(false) + { + } + + ExplorerCmd(LPCTSTR url) + : _path(url), + _flags(0), + _cmdShow(SW_SHOWNORMAL), + _valid_path(true) //@@ + { + } + + bool ParseCmdLine(LPCTSTR lpCmdLine); + bool EvaluateOption(LPCTSTR option); + bool IsValidPath() const; + + String _path; + int _flags; // OPEN_WINDOW_MODE + int _cmdShow; + bool _valid_path; +}; + #include "shell/mainframe.h" + #endif _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/explorer_intres.rc --- branches/lean-explorer/reactos/subsys/system/explorer/explorer_intres.rc 2005-10-08 17:17:27 UTC (rev 18345) +++ branches/lean-explorer/reactos/subsys/system/explorer/explorer_intres.rc 2005-10-08 17:25:32 UTC (rev 18346) @@ -805,7 +805,9 @@ // // Generated from the TEXTINCLUDE 3 resource. // +#ifndef ROSSHELL IDB_TOOLBAR BITMAP DISCARDABLE "res/toolbar.bmp" +#endif #ifndef _ROS_ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/mainframe.cp p --- branches/lean-explorer/reactos/subsys/system/explorer/shell/mainframe.cp p 2005-10-08 17:17:27 UTC (rev 18345) +++ branches/lean-explorer/reactos/subsys/system/explorer/shell/mainframe.cp p 2005-10-08 17:25:32 UTC (rev 18346) @@ -82,6 +82,8 @@ delete _shellBrowser.release(); } + ///@todo use OWM_ROOTED flag + // create explorer treeview if (_create_info._open_mode & OWM_EXPLORE) { if (!_left_hwnd) { _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/mainframe.h --- branches/lean-explorer/reactos/subsys/system/explorer/shell/mainframe.h 2005-10-08 17:17:27 UTC (rev 18345) +++ branches/lean-explorer/reactos/subsys/system/explorer/shell/mainframe.h 2005-10-08 17:25:32 UTC (rev 18346) @@ -27,8 +27,14 @@ #define PM_OPEN_WINDOW (WM_APP+0x07) -enum OPEN_WINDOW_MODE {OWM_EXPLORE=1, OWM_DETAILS=2, OWM_PIDL=4}; +enum OPEN_WINDOW_MODE { + OWM_EXPLORE=1, /// window in explore mode + OWM_ROOTED=2, /// "rooted" window with special shell namespace root + OWM_DETAILS=4, /// view files in detail mode + OWM_PIDL=8, /// path is given as PIDL, otherwise as LPCTSTR + OWM_SEPARATE=16 /// open separate subfolder windows +}; /// Explorer frame window struct MainFrame : public ExtContextMenuHandlerT<PreTranslateWindow> _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .cpp --- branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .cpp 2005-10-08 17:17:27 UTC (rev 18345) +++ branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .cpp 2005-10-08 17:25:32 UTC (rev 18346) @@ -633,7 +633,8 @@ { Entry* entry = NULL; - //@@ + ///@todo use OWM_EXPLORE flag in _create_info._open_mode + if (!_cur_dir) _cur_dir = static_cast<ShellDirectory*>(_root._entry);

19 years, 2 months

[gvg] 18345: Sync to Wine-20050930:

by gvg＠svn.reactos.com

Sync to Wine-20050930: Rein Klazes <wijn(a)wanadoo.nl> - When scrolling, first update the new position of the control before calling UpdateWindow(). Alexandre Julliard <julliard(a)winehq.org> - Fixed gcc 4.0 warnings. - We are no longer generating .dbg.c files. Krzysztof Foltman <wdev(a)foltman.com> - Reimplementation of EM_LINELENGTH. - Some attempt at documentation of double-linked list of ME_DisplayItem's. - Optional destinations in stylesheets are now skipped properly (and not treated as the "proper" styles as they were before). - EOF condition in the middle of the stylesheet is no longer putting the reader into infinite loop, - Half-full input buffers don't trigger EOF anymore (although it could, in theory, break some apps, I find it unlikely - and the change makes Out from Boneville installer display license properly). Marcus Meissner <marcus(a)jet.franken.de> - The last argument to MultiByteToWideChar is wide character count and not the buffer size in bytes. Fixed all places where it was wrong. Modified: trunk/reactos/lib/riched20/editor.c Modified: trunk/reactos/lib/riched20/editor.h Modified: trunk/reactos/lib/riched20/editstr.h Modified: trunk/reactos/lib/riched20/reader.c Modified: trunk/reactos/lib/riched20/row.c Modified: trunk/reactos/lib/riched20/style.c Modified: trunk/reactos/lib/riched20/writer.c _____ Modified: trunk/reactos/lib/riched20/editor.c --- trunk/reactos/lib/riched20/editor.c 2005-10-08 17:15:42 UTC (rev 18344) +++ trunk/reactos/lib/riched20/editor.c 2005-10-08 17:17:27 UTC (rev 18345) @@ -515,9 +515,9 @@ ME_StreamInFill(ME_InStream *stream) { stream->editstream->dwError = stream->editstream->pfnCallback(stream->editstream->dwCookie, - stream->buffer, + (BYTE *)stream->buffer, sizeof(stream->buffer), - &stream->dwSize); + (LONG *)&stream->dwSize); stream->dwUsed = 0; } @@ -1097,7 +1097,7 @@ SCROLLINFO si; ME_TextEditor *editor = (ME_TextEditor *)GetWindowLongW(hWnd, 0); - TRACE("hWnd %p msg %d (%s) %08x %08lx\n", + TRACE("hWnd %p msg %04x (%s) %08x %08lx\n", hWnd, msg, get_msg_name(msg), wParam, lParam); switch(msg) { @@ -1188,7 +1188,7 @@ UINT from, to; PUINT pfrom = wParam ? (PUINT)wParam : &from; PUINT pto = lParam ? (PUINT)lParam : &to; - ME_GetSelection(editor, pfrom, pto); + ME_GetSelection(editor, (int *)pfrom, (int *)pto); if ((*pfrom|*pto) & 0xFFFF0000) return -1; return MAKELONG(*pfrom,*pto); @@ -1359,13 +1359,14 @@ if (nPos<0) nPos = 0; if (nPos != editor->nScrollPosY) { + int dy = editor->nScrollPosY - nPos; + editor->nScrollPosY = nPos; + SetScrollPos(hWnd, SB_VERT, nPos, TRUE); if (editor->bRedraw) { - ScrollWindow(hWnd, 0, editor->nScrollPosY-nPos, NULL, NULL); - SetScrollPos(hWnd, SB_VERT, nPos, TRUE); + ScrollWindow(hWnd, 0, dy, NULL, NULL); UpdateWindow(hWnd); } - editor->nScrollPosY = nPos; } return TRUE; /* Should return false if a single line richedit control */ } @@ -1622,7 +1623,7 @@ case EM_LINELENGTH: { ME_DisplayItem *item, *item_end; - int nChars = 0; + int nChars = 0, nThisLineOfs = 0, nNextLineOfs = 0; if (wParam > ME_GetTextLength(editor)) return 0; @@ -1633,17 +1634,13 @@ } item = ME_FindItemAtOffset(editor, diRun, wParam, NULL); item = ME_RowStart(item); - item_end = ME_RowEnd(item); - if (!item_end) - { - /* Empty buffer, no runs */ - nChars = 0; - } + nThisLineOfs = ME_CharOfsFromRunOfs(editor, ME_FindItemFwd(item, diRun), 0); + item_end = ME_FindItemFwd(item, diStartRow); + if (item_end) + nNextLineOfs = ME_CharOfsFromRunOfs(editor, ME_FindItemFwd(item_end, diRun), 0); else - { - nChars = ME_CharOfsFromRunOfs(editor, item_end, ME_StrLen(item_end->member.run.strText)); - nChars -= ME_CharOfsFromRunOfs(editor, item, 0); - } + nNextLineOfs = ME_FindItemFwd(item, diParagraphOrEnd)->member.para.nCharOfs-1; + nChars = nNextLineOfs - nThisLineOfs; TRACE("EM_LINELENGTH(%d)==%d\n",wParam, nChars); return nChars; } @@ -1849,13 +1846,14 @@ break; } if (nPos != editor->nScrollPosY) { + int dy = editor->nScrollPosY - nPos; + editor->nScrollPosY = nPos; + SetScrollPos(hWnd, SB_VERT, nPos, TRUE); if (editor->bRedraw) { - ScrollWindow(hWnd, 0, editor->nScrollPosY-nPos, NULL, NULL); - SetScrollPos(hWnd, SB_VERT, nPos, TRUE); + ScrollWindow(hWnd, 0, dy, NULL, NULL); UpdateWindow(hWnd); } - editor->nScrollPosY = nPos; } break; } @@ -1872,13 +1870,14 @@ if (nPos<0) nPos = 0; if (nPos != editor->nScrollPosY) { + int dy = editor->nScrollPosY - nPos; + editor->nScrollPosY = nPos; + SetScrollPos(hWnd, SB_VERT, nPos, TRUE); if (editor->bRedraw) { - ScrollWindow(hWnd, 0, editor->nScrollPosY-nPos, NULL, NULL); - SetScrollPos(hWnd, SB_VERT, nPos, TRUE); + ScrollWindow(hWnd, 0, dy, NULL, NULL); UpdateWindow(hWnd); } - editor->nScrollPosY = nPos; } break; } _____ Modified: trunk/reactos/lib/riched20/editor.h --- trunk/reactos/lib/riched20/editor.h 2005-10-08 17:15:42 UTC (rev 18344) +++ trunk/reactos/lib/riched20/editor.h 2005-10-08 17:17:27 UTC (rev 18345) @@ -98,7 +98,7 @@ /* row.c */ ME_DisplayItem *ME_FindRowStart(ME_Context *c, ME_DisplayItem *run, int nRelPos); ME_DisplayItem *ME_RowStart(ME_DisplayItem *item); -ME_DisplayItem *ME_RowEnd(ME_DisplayItem *item); +/* ME_DisplayItem *ME_RowEnd(ME_DisplayItem *item); */ void ME_RenumberParagraphs(ME_DisplayItem *item); /* TODO */ ME_DisplayItem *ME_FindRowWithNumber(ME_TextEditor *editor, int nRow); int ME_RowNumberFromCharOfs(ME_TextEditor *editor, int nOfs); _____ Modified: trunk/reactos/lib/riched20/editstr.h --- trunk/reactos/lib/riched20/editstr.h 2005-10-08 17:15:42 UTC (rev 18344) +++ trunk/reactos/lib/riched20/editstr.h 2005-10-08 17:17:27 UTC (rev 18345) @@ -161,6 +161,18 @@ int nYPos; } ME_Row; +/* the display item list layout is like this: + * - the document consists of paragraphs + * - each paragraph contains at least one run, the last run in the paragraph + * is an end-of-paragraph run + * - each formatted paragraph contains at least one row, which corresponds + * to a screen line (that's why there are no rows in an unformatted + * paragraph + * - the paragraphs contain "shortcut" pointers to the previous and the next + * paragraph, that makes iteration over paragraphs faster + * - the list starts with diTextStart and ends with diTextEnd + */ + typedef struct tagME_DisplayItem { ME_DIType type; @@ -212,7 +224,7 @@ EDITSTREAM *editstream; DWORD dwSize; DWORD dwUsed; - BYTE buffer[STREAMIN_BUFFER_SIZE]; + char buffer[STREAMIN_BUFFER_SIZE]; }; typedef struct tagME_InStream ME_InStream; _____ Modified: trunk/reactos/lib/riched20/reader.c --- trunk/reactos/lib/riched20/reader.c 2005-10-08 17:15:42 UTC (rev 18344) +++ trunk/reactos/lib/riched20/reader.c 2005-10-08 17:17:27 UTC (rev 18345) @@ -127,10 +127,13 @@ TRACE("\n"); - /* if the last buffer wasn't full, it's EOF */ + /* Doc says, that if the last buffer wasn't full, it's EOF. + Actually, that's not true. */ +/* if (stream->dwSize > 0 && stream->dwSize == stream->dwUsed && stream->dwSize < sizeof(stream->buffer)) return EOF; +*/ if (stream->dwSize <= stream->dwUsed) { ME_StreamInFill(stream); @@ -1089,12 +1092,15 @@ RTFStyleElt *sep, *sepLast; char buf[rtfBufSiz], *bp; const char *fn = "ReadStyleSheet"; + int real_style; TRACE("\n"); for (;;) { RTFGetToken (info); + if (info->rtfClass == rtfEOF) + break; if (RTFCheckCM (info, rtfGroup, rtfEndGroup)) break; sp = New (RTFStyle); @@ -1112,6 +1118,7 @@ info->styleList = sp; if (!RTFCheckCM (info, rtfGroup, rtfBeginGroup)) RTFPanic (info,"%s: missing \"{\"", fn); + real_style = TRUE; for (;;) { RTFGetToken (info); @@ -1120,8 +1127,15 @@ break; if (info->rtfClass == rtfControl) { - if (RTFCheckMM (info, rtfSpecialChar, rtfOptDest)) - continue; /* ignore "\*" */ + if (RTFCheckMM (info, rtfSpecialChar, rtfOptDest)) { + RTFGetToken(info); + RTFPanic(info, "%s: skipping optional destination", fn); + RTFSkipGroup(info); + info->rtfClass = rtfGroup; + info->rtfMajor = rtfEndGroup; + real_style = FALSE; + break; /* ignore "\*" */ + } if (RTFCheckMM (info, rtfParAttr, rtfStyleNum)) { sp->rtfSNum = info->rtfParam; @@ -1178,6 +1192,7 @@ * This passes over "{\*\keycode ... }, among * other things. A temporary (perhaps) hack. */ + RTFPanic(info, "%s: skipping begin", fn); RTFSkipGroup (info); continue; } @@ -1207,31 +1222,33 @@ fn, info->rtfTextBuf); } } - RTFGetToken (info); - if (!RTFCheckCM (info, rtfGroup, rtfEndGroup)) - RTFPanic (info, "%s: missing \"}\"", fn); - - /* - * Check over the style structure. A name is a must. - * If no style number was specified, check whether it's the - * Normal style (in which case it's given style number - * rtfNormalStyleNum). Note that some "normal" style names - * just begin with "Normal" and can have other stuff following, - * e.g., "Normal,Times 10 point". Ugh. - * - * Some German RTF writers use "Standard" instead of "Normal". - */ - if (sp->rtfSName == NULL) - RTFPanic (info,"%s: missing style name", fn); - if (sp->rtfSNum < 0) - { - if (strncmp (buf, "Normal", 6) != 0 - && strncmp (buf, "Standard", 8) != 0) - RTFPanic (info,"%s: missing style number", fn); - sp->rtfSNum = rtfNormalStyleNum; + if (real_style) { + RTFGetToken (info); + if (!RTFCheckCM (info, rtfGroup, rtfEndGroup)) + RTFPanic (info, "%s: missing \"}\"", fn); + /* + * Check over the style structure. A name is a must. + * If no style number was specified, check whether it's the + * Normal style (in which case it's given style number + * rtfNormalStyleNum). Note that some "normal" style names + * just begin with "Normal" and can have other stuff following, + * e.g., "Normal,Times 10 point". Ugh. + * + * Some German RTF writers use "Standard" instead of "Normal". + */ + if (sp->rtfSName == NULL) + RTFPanic (info,"%s: missing style name", fn); + if (sp->rtfSNum < 0) + { + if (strncmp (buf, "Normal", 6) != 0 + && strncmp (buf, "Standard", 8) != 0) + RTFPanic (info,"%s: missing style number", fn); + sp->rtfSNum = rtfNormalStyleNum; + } + if (sp->rtfSNextPar == -1) /* if \snext not given, */ + sp->rtfSNextPar = sp->rtfSNum; /* next is itself */ } - if (sp->rtfSNextPar == -1) /* if \snext not given, */ - sp->rtfSNextPar = sp->rtfSNum; /* next is itself */ + /* otherwise we're just dealing with fake end group from skipped group */ } RTFRouteToken (info); /* feed "}" back to router */ } @@ -2755,7 +2772,7 @@ int length; length = MultiByteToWideChar(info->codePage, 0, info->cpOutputBuffer, - info->dwCPOutputCount, buffer, bufferMax); + info->dwCPOutputCount, buffer, bufferMax/sizeof(WCHAR)); info->dwCPOutputCount = 0; RTFPutUnicodeString(info, buffer, length); _____ Modified: trunk/reactos/lib/riched20/row.c --- trunk/reactos/lib/riched20/row.c 2005-10-08 17:15:42 UTC (rev 18344) +++ trunk/reactos/lib/riched20/row.c 2005-10-08 17:17:27 UTC (rev 18345) @@ -77,13 +77,14 @@ return ME_FindItemBackOrHere(item, diStartRow); } +/* ME_DisplayItem *ME_RowEnd(ME_DisplayItem *item) { ME_DisplayItem *item2 = ME_FindItemFwd(item, diStartRowOrParagraphOrEnd); if (!item2) return NULL; return ME_FindItemBack(item, diRun); } +*/ - ME_DisplayItem * ME_FindRowWithNumber(ME_TextEditor *editor, int nRow) { _____ Modified: trunk/reactos/lib/riched20/style.c --- trunk/reactos/lib/riched20/style.c 2005-10-08 17:15:42 UTC (rev 18344) +++ trunk/reactos/lib/riched20/style.c 2005-10-08 17:17:27 UTC (rev 18345) @@ -52,7 +52,7 @@ CopyMemory(to, f, sizeof(CHARFORMATA)-sizeof(f->szFaceName)); /* convert face name */ if (f->dwMask & CFM_FACE) - MultiByteToWideChar(0, 0, f->szFaceName, -1, to->szFaceName, sizeof(to->szFaceName)); + MultiByteToWideChar(0, 0, f->szFaceName, -1, to->szFaceName, sizeof(to->szFaceName)/sizeof(WCHAR)); /* copy the rest of the 2A structure to 2W */ CopyMemory(1+((CHARFORMATW *)to), f+1, sizeof(CHARFORMAT2A)-sizeof(CHARFORMATA)); to->cbSize = sizeof(CHARFORMAT2W); _____ Modified: trunk/reactos/lib/riched20/writer.c --- trunk/reactos/lib/riched20/writer.c 2005-10-08 17:15:42 UTC (rev 18344) +++ trunk/reactos/lib/riched20/writer.c 2005-10-08 17:17:27 UTC (rev 18345) @@ -55,7 +55,7 @@ on initial random nWritten value, which is usually >STREAMOUT_BUFFER_SIZE */ nRemaining = editor->pStream->pos - nStart; nWritten = 0xDEADBEEF; - stream->dwError = stream->pfnCallback(stream->dwCookie, editor->pStream->buffer + nStart, + stream->dwError = stream->pfnCallback(stream->dwCookie, (LPBYTE)editor->pStream->buffer + nStart, editor->pStream->pos - nStart, &nWritten); TRACE("error=%lu written=%lu\n", stream->dwError, nWritten); if (nWritten > (editor->pStream->pos - nStart) || nWritten<0) { @@ -86,7 +86,7 @@ static BOOL -ME_StreamOutMove(ME_TextEditor *editor, BYTE *buffer, int len) +ME_StreamOutMove(ME_TextEditor *editor, const char *buffer, int len) { ME_OutStream *pStream = editor->pStream; @@ -599,8 +599,8 @@ nChars--; } else { BOOL unknown = FALSE; - BYTE letter[3]; - + char letter[3]; + /* FIXME: In the MS docs for WideCharToMultiByte there is a big list of * codepages including CP_SYMBOL for which the last parameter must be set * to NULL for the function to succeed. But in Wine we need to care only @@ -610,7 +610,7 @@ (editor->pStream->nCodePage == CP_SYMBOL) ? NULL : &unknown); if (unknown) pos += sprintf(buffer + pos, "\\u%d?", (short)*text); - else if (*letter < 128) { + else if ((BYTE)*letter < 128) { if (*letter == '{' || *letter == '}' || *letter == '\\') buffer[pos++] = '\\'; buffer[pos++] = *letter; @@ -720,7 +720,7 @@ ME_DisplayItem *item = ME_FindItemAtOffset(editor, diRun, nStart, &nStart); int nLen; UINT nCodePage = CP_ACP; - BYTE *buffer = NULL; + char *buffer = NULL; int nBufLen = 0; BOOL success = TRUE; @@ -738,15 +738,15 @@ nLen = nChars; if (item->member.run.nFlags & MERF_ENDPARA) { - WCHAR szEOL[] = { '\r', '\n' }; + static const WCHAR szEOL[2] = { '\r', '\n' }; if (dwFormat & SF_UNICODE) - success = ME_StreamOutMove(editor, (BYTE *)szEOL, 4); + success = ME_StreamOutMove(editor, (const char *)szEOL, sizeof(szEOL)); else success = ME_StreamOutMove(editor, "\r\n", 2); } else { if (dwFormat & SF_UNICODE) - success = ME_StreamOutMove(editor, (BYTE *)(item->member.run.strText->szData + nStart), + success = ME_StreamOutMove(editor, (const char *)(item->member.run.strText->szData + nStart), sizeof(WCHAR) * nLen); else { int nSize; @@ -756,7 +756,7 @@ if (nSize > nBufLen) { if (buffer) FREE_OBJ(buffer); - buffer = ALLOC_N_OBJ(BYTE, nSize); + buffer = ALLOC_N_OBJ(char, nSize); nBufLen = nSize; } WideCharToMultiByte(nCodePage, 0, item->member.run.strText->szData + nStart,

19 years, 2 months

[gvg] 18344: Fix EOLs

by gvg＠svn.reactos.com

Fix EOLs Modified: trunk/reactos/lib/olepro32/README Modified: trunk/reactos/lib/olepro32/olepro32.rc _____ Modified: trunk/reactos/lib/olepro32/README --- trunk/reactos/lib/olepro32/README 2005-10-08 17:13:07 UTC (rev 18343) +++ trunk/reactos/lib/olepro32/README 2005-10-08 17:15:42 UTC (rev 18344) @@ -1,9 +1,9 @@ -29Nov99 -Sean Langley - -This library (OLEPRO32.DLL) is basically a sub-set of what is in OLEAUT32.DLL. -The main difference under Win32 is that OLEPRO32.DLL can be used -as a type library. There are two functions in this DLL which are already -implemented in Wine. They are OleCreateFontIndirect, and OleTranslateColor. -The spec file for both of these functions points to the functions in the -OLEAUT32.DLL. +29Nov99 +Sean Langley + +This library (OLEPRO32.DLL) is basically a sub-set of what is in OLEAUT32.DLL. +The main difference under Win32 is that OLEPRO32.DLL can be used +as a type library. There are two functions in this DLL which are already +implemented in Wine. They are OleCreateFontIndirect, and OleTranslateColor. +The spec file for both of these functions points to the functions in the +OLEAUT32.DLL. Property changes on: trunk/reactos/lib/olepro32/README ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/olepro32/olepro32.rc --- trunk/reactos/lib/olepro32/olepro32.rc 2005-10-08 17:13:07 UTC (rev 18343) +++ trunk/reactos/lib/olepro32/olepro32.rc 2005-10-08 17:15:42 UTC (rev 18344) @@ -1,28 +1,28 @@ -/* Language neutral resources. - * - * Copyright 2003 Stefan Leichter - * - * 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 - */ - -#define WINE_FILEDESCRIPTION_STR "Wine Cabinet File API" -#define WINE_FILENAME_STR "cabinet.dll" -#define WINE_FILEVERSION 5,0,2147,1 -#define WINE_FILEVERSION_STR "5.0.2147.1" - -#define WINE_PRODUCTVERSION 5,0,2147,1 -#define WINE_PRODUCTVERSION_STR "5.0" - -#include "wine/wine_common_ver.rc" +/* Language neutral resources. + * + * Copyright 2003 Stefan Leichter + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Cabinet File API" +#define WINE_FILENAME_STR "cabinet.dll" +#define WINE_FILEVERSION 5,0,2147,1 +#define WINE_FILEVERSION_STR "5.0.2147.1" + +#define WINE_PRODUCTVERSION 5,0,2147,1 +#define WINE_PRODUCTVERSION_STR "5.0" + +#include "wine/wine_common_ver.rc" Property changes on: trunk/reactos/lib/olepro32/olepro32.rc ___________________________________________________________________ Name: svn:eol-style + native

19 years, 2 months

[gvg] 18343: Sync to Wine-20050930:

by gvg＠svn.reactos.com

Sync to Wine-20050930: Alexandre Julliard <julliard(a)winehq.org> - We are no longer generating .dbg.c files. Alexander N. Sørnes <alex(a)thehandofagony.com> - Added Norwegian translations. Added: trunk/reactos/lib/oledlg/oledlg_No.rc Modified: trunk/reactos/lib/oledlg/rsrc.rc _____ Copied: trunk/reactos/lib/oledlg/oledlg_No.rc (from rev 18342, vendor/wine/dlls/oledlg/current/oledlg_No.rc) Property changes on: trunk/reactos/lib/oledlg/oledlg_No.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/oledlg/rsrc.rc --- trunk/reactos/lib/oledlg/rsrc.rc 2005-10-08 17:10:59 UTC (rev 18342) +++ trunk/reactos/lib/oledlg/rsrc.rc 2005-10-08 17:13:07 UTC (rev 18343) @@ -39,5 +39,6 @@ #include "oledlg_It.rc" #include "oledlg_Ja.rc" #include "oledlg_Nl.rc" +#include "oledlg_No.rc" #include "oledlg_Pt.rc" #include "oledlg_Ru.rc"

19 years, 2 months

[gvg] 18342: Sync to Wine-20050930:

by gvg＠svn.reactos.com

Sync to Wine-20050930: Francois Gouget <fgouget(a)free.fr> - Fix .spec declarations for functinos with 64bit arguments (reported by winapi_check). Robert Shearman <rob(a)codeweavers.com> - Add VT_UNKNOWN support for VARIANT marshaling by generalising the existing VT_DISPATCH code. - Fix ref-counting rules to match native DCOM Dlls. Alex Villacís Lasso <a_villacis(a)palosanto.com> - Modify VarDiv() and VarSub() to use the existing VarDecSub() and VarDecDiv() for DECIMAL. - Fix a scaling error in VarR4FromDec() and VarR8FromDec() that incorrectly multiplies the high 32 bits of the DECIMAL by 1e64 instead of the correct 2^64. - Make Single|Double->BSTR conversion use the specified locale for the decimal point even without the LOCALE_USE_NLS flag. Test supplied. Alexandre Julliard <julliard(a)winehq.org> - We are no longer generating .spec.c files. - Removed unused debug channels. - Specify 64-bit integers as double instead of long long in spec files so that we get the correct number of arguments. - Use a more portable scheme for storing the name of a critical section. - Use MAKEINTRESOURCE instead of casts where appropriate. - We are no longer generating .dbg.c files. Milko Krachounov <milko(a)3mhz.net> - Bulgarian resources for mpr, msi, user, commdlg, oleaut32, shdocvw, shell32, comctl32, msrle32, mshtml, winspool, wineps, serialui, setupapi, wininet, regedit, uninstaller, notepad, winecfg and winhelp. Mike McCormack <mike(a)codeweavers.com> - Fix "empty body in an if/else-statement" warnings. Walt Ogburn <reuben(a)ugcs.caltech.edu> - Get IFontDisp type information from stdole2.tlb, instead of IDispatch information from stdole32.tlb. Marcus Meissner <marcus(a)jet.franken.de> - Support more arguments in _invoke(). Marcus Meissner <meissner(a)suse.de> - VT_PTR->VT_USERDEFINED chains depend on the TKIND of the userdefined type due to our handling of COM interfaces in there. Modified: trunk/reactos/lib/oleaut32/dispatch.c Modified: trunk/reactos/lib/oleaut32/oleaut32.rc Modified: trunk/reactos/lib/oleaut32/oleaut32.spec Added: trunk/reactos/lib/oleaut32/oleaut32_Bg.rc Modified: trunk/reactos/lib/oleaut32/oleaut32_Cz.rc Modified: trunk/reactos/lib/oleaut32/oleaut32_De.rc Modified: trunk/reactos/lib/oleaut32/oleaut32_Dk.rc Modified: trunk/reactos/lib/oleaut32/oleaut32_En.rc Modified: trunk/reactos/lib/oleaut32/oleaut32_Es.rc Modified: trunk/reactos/lib/oleaut32/oleaut32_Fr.rc Modified: trunk/reactos/lib/oleaut32/oleaut32_Hu.rc Modified: trunk/reactos/lib/oleaut32/oleaut32_It.rc Modified: trunk/reactos/lib/oleaut32/oleaut32_Nl.rc Modified: trunk/reactos/lib/oleaut32/oleaut32_No.rc Modified: trunk/reactos/lib/oleaut32/oleaut32_Pl.rc Modified: trunk/reactos/lib/oleaut32/oleaut32_Pt.rc Modified: trunk/reactos/lib/oleaut32/oleaut32_Ru.rc Modified: trunk/reactos/lib/oleaut32/oleaut32_Sv.rc Modified: trunk/reactos/lib/oleaut32/oleaut32_Th.rc Modified: trunk/reactos/lib/oleaut32/olefont.c Modified: trunk/reactos/lib/oleaut32/tmarshal.c Modified: trunk/reactos/lib/oleaut32/typelib.c Modified: trunk/reactos/lib/oleaut32/usrmarshal.c Modified: trunk/reactos/lib/oleaut32/variant.c Modified: trunk/reactos/lib/oleaut32/vartype.c Modified: trunk/reactos/lib/oleaut32/version.rc _____ Modified: trunk/reactos/lib/oleaut32/dispatch.c --- trunk/reactos/lib/oleaut32/dispatch.c 2005-10-08 17:05:40 UTC (rev 18341) +++ trunk/reactos/lib/oleaut32/dispatch.c 2005-10-08 17:10:59 UTC (rev 18342) @@ -40,7 +40,6 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); -WINE_DECLARE_DEBUG_CHANNEL(typelib); static IDispatch * WINAPI StdDispatch_Construct(IUnknown * punkOuter, void * pvThis, ITypeInfo * pTypeInfo); _____ Modified: trunk/reactos/lib/oleaut32/oleaut32.rc --- trunk/reactos/lib/oleaut32/oleaut32.rc 2005-10-08 17:05:40 UTC (rev 18341) +++ trunk/reactos/lib/oleaut32/oleaut32.rc 2005-10-08 17:10:59 UTC (rev 18342) @@ -1,48 +1,49 @@ -/* - * Top level resource file for oleaut32 - * - * Copyright 2003 Jon Griffiths - * - * 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 - */ - -#include "windef.h" -#include "winbase.h" -#include "resource.h" - -#include "version.rc" - -#include "oleaut32_De.rc" -#include "oleaut32_Dk.rc" -#include "oleaut32_En.rc" -#include "oleaut32_Es.rc" -#include "oleaut32_Cz.rc" -#include "oleaut32_Fr.rc" -#include "oleaut32_Hu.rc" -#include "oleaut32_It.rc" -#include "oleaut32_Nl.rc" -#include "oleaut32_No.rc" -#include "oleaut32_Pl.rc" -#include "oleaut32_Pt.rc" -#include "oleaut32_Ru.rc" -#include "oleaut32_Sv.rc" -#include "oleaut32_Th.rc" - -/* - * FIXME: - * Finnish, Greek, Hebrew, Japanese, Korean, - * Turkish, Slovenian (at least) are localised in XP Home. - * I expect Chinese etc are localised in Asian Editions also. - */ +/* + * Top level resource file for oleaut32 + * + * Copyright 2003 Jon Griffiths + * + * 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 + */ + +#include "windef.h" +#include "winbase.h" +#include "resource.h" + +#include "version.rc" + +#include "oleaut32_Bg.rc" +#include "oleaut32_De.rc" +#include "oleaut32_Dk.rc" +#include "oleaut32_En.rc" +#include "oleaut32_Es.rc" +#include "oleaut32_Cz.rc" +#include "oleaut32_Fr.rc" +#include "oleaut32_Hu.rc" +#include "oleaut32_It.rc" +#include "oleaut32_Nl.rc" +#include "oleaut32_No.rc" +#include "oleaut32_Pl.rc" +#include "oleaut32_Pt.rc" +#include "oleaut32_Ru.rc" +#include "oleaut32_Sv.rc" +#include "oleaut32_Th.rc" + +/* + * FIXME: + * Finnish, Greek, Hebrew, Japanese, Korean, + * Turkish, Slovenian (at least) are localised in XP Home. + * I expect Chinese etc are localised in Asian Editions also. + */ Property changes on: trunk/reactos/lib/oleaut32/oleaut32.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/oleaut32/oleaut32.spec --- trunk/reactos/lib/oleaut32/oleaut32.spec 2005-10-08 17:05:40 UTC (rev 18341) +++ trunk/reactos/lib/oleaut32/oleaut32.spec 2005-10-08 17:10:59 UTC (rev 18342) @@ -48,7 +48,7 @@ 49 stdcall VarI2FromI4(long ptr) 50 stdcall VarI2FromR4(long ptr) 51 stdcall VarI2FromR8(double ptr) -52 stdcall VarI2FromCy(long long ptr) +52 stdcall VarI2FromCy(double ptr) 53 stdcall VarI2FromDate(double ptr) 54 stdcall VarI2FromStr(wstr long long ptr) 55 stdcall VarI2FromDisp(ptr long ptr) @@ -58,7 +58,7 @@ 59 stdcall VarI4FromI2(long ptr) 60 stdcall VarI4FromR4(long ptr) 61 stdcall VarI4FromR8(double ptr) -62 stdcall VarI4FromCy(long long ptr) +62 stdcall VarI4FromCy(double ptr) 63 stdcall VarI4FromDate(double ptr) 64 stdcall VarI4FromStr(wstr long long ptr) 65 stdcall VarI4FromDisp(ptr long ptr) @@ -68,7 +68,7 @@ 69 stdcall VarR4FromI2(long ptr) 70 stdcall VarR4FromI4(long ptr) 71 stdcall VarR4FromR8(double ptr) -72 stdcall VarR4FromCy(long long ptr) +72 stdcall VarR4FromCy(double ptr) 73 stdcall VarR4FromDate(double ptr) 74 stdcall VarR4FromStr(wstr long long ptr) 75 stdcall VarR4FromDisp(ptr long ptr) @@ -78,7 +78,7 @@ 79 stdcall VarR8FromI2(long ptr) 80 stdcall VarR8FromI4(long ptr) 81 stdcall VarR8FromR4(long ptr) -82 stdcall VarR8FromCy(long long ptr) +82 stdcall VarR8FromCy(double ptr) 83 stdcall VarR8FromDate(double ptr) 84 stdcall VarR8FromStr(wstr long long ptr) 85 stdcall VarR8FromDisp(ptr long ptr) @@ -89,7 +89,7 @@ 90 stdcall VarDateFromI4(long ptr) 91 stdcall VarDateFromR4(long ptr) 92 stdcall VarDateFromR8(double ptr) -93 stdcall VarDateFromCy(long long ptr) +93 stdcall VarDateFromCy(double ptr) 94 stdcall VarDateFromStr(wstr long long ptr) 95 stdcall VarDateFromDisp(ptr long ptr) 96 stdcall VarDateFromBool(long ptr) @@ -109,7 +109,7 @@ 110 stdcall VarBstrFromI4(long long long ptr) 111 stdcall VarBstrFromR4(long long long ptr) 112 stdcall VarBstrFromR8(double long long ptr) -113 stdcall VarBstrFromCy(long long long long ptr) +113 stdcall VarBstrFromCy(double long long ptr) 114 stdcall VarBstrFromDate(double long long ptr) 115 stub VarBstrFromDisp 116 stdcall VarBstrFromBool(long long long ptr) @@ -120,7 +120,7 @@ 121 stdcall VarBoolFromR4(long ptr) 122 stdcall VarBoolFromR8(double ptr) 123 stdcall VarBoolFromDate(double ptr) -124 stdcall VarBoolFromCy(long long ptr) +124 stdcall VarBoolFromCy(double ptr) 125 stdcall VarBoolFromStr(wstr long long ptr) 126 stdcall VarBoolFromDisp(ptr long ptr) 127 stdcall VarFormatCurrency(ptr long long long long long ptr) @@ -130,7 +130,7 @@ 131 stdcall VarUI1FromI4(long ptr) 132 stdcall VarUI1FromR4(long ptr) 133 stdcall VarUI1FromR8(double ptr) -134 stdcall VarUI1FromCy(long long ptr) +134 stdcall VarUI1FromCy(double ptr) 135 stdcall VarUI1FromDate(double ptr) 136 stdcall VarUI1FromStr(wstr long long ptr) 137 stdcall VarUI1FromDisp(ptr long ptr) @@ -190,7 +190,7 @@ 193 stdcall VarDecFromR4(long ptr) 194 stdcall VarDecFromR8(double ptr) 195 stdcall VarDecFromDate(double ptr) -196 stdcall VarDecFromCy(long long ptr) +196 stdcall VarDecFromCy(double ptr) 197 stdcall VarDecFromStr(wstr long long ptr) 198 stdcall VarDecFromDisp(ptr long ptr) 199 stdcall VarDecFromBool(long ptr) @@ -244,7 +244,7 @@ 247 stdcall VarI1FromR4(long ptr) 248 stdcall VarI1FromR8(double ptr) 249 stdcall VarI1FromDate(double ptr) -250 stdcall VarI1FromCy(long long ptr) +250 stdcall VarI1FromCy(double ptr) 251 stdcall VarI1FromStr(wstr long long ptr) 252 stdcall VarI1FromDisp(ptr long ptr) 253 stdcall VarI1FromBool(long ptr) @@ -257,7 +257,7 @@ 260 stdcall VarUI2FromR4(long ptr) 261 stdcall VarUI2FromR8(double ptr) 262 stdcall VarUI2FromDate(double ptr) -263 stdcall VarUI2FromCy(long long ptr) +263 stdcall VarUI2FromCy(double ptr) 264 stdcall VarUI2FromStr(wstr long long ptr) 265 stdcall VarUI2FromDisp(ptr long ptr) 266 stdcall VarUI2FromBool(long ptr) @@ -270,7 +270,7 @@ 273 stdcall VarUI4FromR4(long ptr) 274 stdcall VarUI4FromR8(double ptr) 275 stdcall VarUI4FromDate(double ptr) -276 stdcall VarUI4FromCy(long long ptr) +276 stdcall VarUI4FromCy(double ptr) 277 stdcall VarUI4FromStr(wstr long long ptr) 278 stdcall VarUI4FromDisp(ptr long ptr) 279 stdcall VarUI4FromBool(long ptr) @@ -293,17 +293,17 @@ 296 stub LPSAFEARRAY_Marshal 297 stub LPSAFEARRAY_Unmarshal 298 stdcall VarDecCmpR8(ptr double) -299 stdcall VarCyAdd(long long long long ptr) -303 stdcall VarCyMul(long long long long ptr) -304 stdcall VarCyMulI4(long long long ptr) -305 stdcall VarCySub(long long long long ptr) -306 stdcall VarCyAbs(long long ptr) -307 stdcall VarCyFix(long long ptr) -308 stdcall VarCyInt(long long ptr) -309 stdcall VarCyNeg(long long ptr) -310 stdcall VarCyRound(long long long ptr) -311 stdcall VarCyCmp(long long long long) -312 stdcall VarCyCmpR8(long long double) +299 stdcall VarCyAdd(double double ptr) +303 stdcall VarCyMul(double double ptr) +304 stdcall VarCyMulI4(double long ptr) +305 stdcall VarCySub(double double ptr) +306 stdcall VarCyAbs(double ptr) +307 stdcall VarCyFix(double ptr) +308 stdcall VarCyInt(double ptr) +309 stdcall VarCyNeg(double ptr) +310 stdcall VarCyRound(double long ptr) +311 stdcall VarCyCmp(double double) +312 stdcall VarCyCmpR8(double double) 313 stdcall VarBstrCat(wstr wstr ptr) 314 stdcall VarBstrCmp(wstr wstr long long) 315 stdcall VarR8Pow(double double ptr) @@ -316,7 +316,7 @@ 325 stub SetVarConversionLocaleSetting 326 stub GetVarConversionLocaleSetting 327 stdcall SetOaNoCache() -329 stdcall VarCyMulI8(long long long long ptr) +329 stdcall VarCyMulI8(double double ptr) 330 stdcall VarDateFromUdate(ptr long ptr) 331 stdcall VarUdateFromDate(double long ptr) 332 stub GetAltMonthNames @@ -324,7 +324,7 @@ 334 stdcall VarI8FromI2(long long) 335 stdcall VarI8FromR4(long long) 336 stdcall VarI8FromR8(double long) -337 stdcall VarI8FromCy(long long ptr) +337 stdcall VarI8FromCy(double ptr) 338 stdcall VarI8FromDate(double long) 339 stdcall VarI8FromStr(wstr long long ptr) 340 stdcall VarI8FromDisp(ptr long ptr) @@ -333,30 +333,30 @@ 343 stdcall VarI8FromUI2(long long) 344 stdcall VarI8FromUI4(long long) 345 stdcall VarI8FromDec(ptr ptr) -346 stdcall VarI2FromI8(long long ptr) -347 stdcall VarI2FromUI8(long long ptr) -348 stdcall VarI4FromI8(long long ptr) -349 stdcall VarI4FromUI8(long long ptr) -360 stdcall VarR4FromI8(long long ptr) -361 stdcall VarR4FromUI8(long long ptr) -362 stdcall VarR8FromI8(long long ptr) -363 stdcall VarR8FromUI8(long long ptr) -364 stdcall VarDateFromI8(long long ptr) -365 stdcall VarDateFromUI8(long long ptr) -366 stdcall VarCyFromI8(long long ptr) -367 stdcall VarCyFromUI8(long long ptr) -368 stdcall VarBstrFromI8(long long long long ptr) -369 stdcall VarBstrFromUI8(long long long long ptr) -370 stdcall VarBoolFromI8(long long ptr) -371 stdcall VarBoolFromUI8(long long ptr) -372 stdcall VarUI1FromI8(long long ptr) -373 stdcall VarUI1FromUI8(long long ptr) -374 stdcall VarDecFromI8(long long ptr) -375 stdcall VarDecFromUI8(long long ptr) -376 stdcall VarI1FromI8(long long ptr) -377 stdcall VarI1FromUI8(long long ptr) -378 stdcall VarUI2FromI8(long long ptr) -379 stdcall VarUI2FromUI8(long long ptr) +346 stdcall VarI2FromI8(double ptr) +347 stdcall VarI2FromUI8(double ptr) +348 stdcall VarI4FromI8(double ptr) +349 stdcall VarI4FromUI8(double ptr) +360 stdcall VarR4FromI8(double ptr) +361 stdcall VarR4FromUI8(double ptr) +362 stdcall VarR8FromI8(double ptr) +363 stdcall VarR8FromUI8(double ptr) +364 stdcall VarDateFromI8(double ptr) +365 stdcall VarDateFromUI8(double ptr) +366 stdcall VarCyFromI8(double ptr) +367 stdcall VarCyFromUI8(double ptr) +368 stdcall VarBstrFromI8(double long long ptr) +369 stdcall VarBstrFromUI8(double long long ptr) +370 stdcall VarBoolFromI8(double ptr) +371 stdcall VarBoolFromUI8(double ptr) +372 stdcall VarUI1FromI8(double ptr) +373 stdcall VarUI1FromUI8(double ptr) +374 stdcall VarDecFromI8(double ptr) +375 stdcall VarDecFromUI8(double ptr) +376 stdcall VarI1FromI8(double ptr) +377 stdcall VarI1FromUI8(double ptr) +378 stdcall VarUI2FromI8(double ptr) +379 stdcall VarUI2FromUI8(double ptr) 380 stub UserHWND_from_local 381 stub UserHWND_to_local 382 stub UserHWND_free_inst @@ -393,15 +393,15 @@ 422 stub OleLoadPictureFile 423 stub OleSavePictureFile 424 stdcall OleLoadPicturePath(wstr ptr long long ptr ptr) -425 stdcall VarUI4FromI8(long long ptr) -426 stdcall VarUI4FromUI8(long long ptr) -427 stdcall VarI8FromUI8(long long ptr) -428 stdcall VarUI8FromI8(long long ptr) +425 stdcall VarUI4FromI8(double ptr) +426 stdcall VarUI4FromUI8(double ptr) +427 stdcall VarI8FromUI8(double ptr) +428 stdcall VarUI8FromI8(double ptr) 429 stdcall VarUI8FromUI1(long ptr) 430 stdcall VarUI8FromI2(long ptr) 431 stdcall VarUI8FromR4(long ptr) 432 stdcall VarUI8FromR8(double ptr) -433 stdcall VarUI8FromCy(long long ptr) +433 stdcall VarUI8FromCy(double ptr) 434 stdcall VarUI8FromDate(double ptr) 435 stdcall VarUI8FromStr(wstr long long ptr) 436 stdcall VarUI8FromDisp(ptr long ptr) _____ Copied: trunk/reactos/lib/oleaut32/oleaut32_Bg.rc (from rev 18341, vendor/wine/dlls/oleaut32/current/oleaut32_Bg.rc) Property changes on: trunk/reactos/lib/oleaut32/oleaut32_Bg.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/oleaut32/oleaut32_Cz.rc --- trunk/reactos/lib/oleaut32/oleaut32_Cz.rc 2005-10-08 17:05:40 UTC (rev 18341) +++ trunk/reactos/lib/oleaut32/oleaut32_Cz.rc 2005-10-08 17:10:59 UTC (rev 18342) @@ -1,31 +1,31 @@ -/* - * Czech resources for oleaut32 - * - * Copyright 2003 Jon Griffiths - * - * 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_CZECH, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_TRUE "Pravda" - IDS_FALSE "Nepravda" - IDS_YES "Ano" - IDS_NO "Ne" - IDS_ON "Zapnuto" - IDS_OFF "Vypnuto" -} +/* + * Czech resources for oleaut32 + * + * Copyright 2003 Jon Griffiths + * + * 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_CZECH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TRUE "Pravda" + IDS_FALSE "Nepravda" + IDS_YES "Ano" + IDS_NO "Ne" + IDS_ON "Zapnuto" + IDS_OFF "Vypnuto" +} Property changes on: trunk/reactos/lib/oleaut32/oleaut32_Cz.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/oleaut32/oleaut32_De.rc --- trunk/reactos/lib/oleaut32/oleaut32_De.rc 2005-10-08 17:05:40 UTC (rev 18341) +++ trunk/reactos/lib/oleaut32/oleaut32_De.rc 2005-10-08 17:10:59 UTC (rev 18342) @@ -1,31 +1,31 @@ -/* - * German resources for oleaut32 - * - * Copyright 2003 Jon Griffiths - * - * 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_GERMAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_TRUE "Wahr" - IDS_FALSE "Falsch" - IDS_YES "Ja" - IDS_NO "Nein" - IDS_ON "Ein" - IDS_OFF "Aus" -} +/* + * German resources for oleaut32 + * + * Copyright 2003 Jon Griffiths + * + * 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_GERMAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TRUE "Wahr" + IDS_FALSE "Falsch" + IDS_YES "Ja" + IDS_NO "Nein" + IDS_ON "Ein" + IDS_OFF "Aus" +} Property changes on: trunk/reactos/lib/oleaut32/oleaut32_De.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/oleaut32/oleaut32_Dk.rc --- trunk/reactos/lib/oleaut32/oleaut32_Dk.rc 2005-10-08 17:05:40 UTC (rev 18341) +++ trunk/reactos/lib/oleaut32/oleaut32_Dk.rc 2005-10-08 17:10:59 UTC (rev 18342) @@ -1,31 +1,31 @@ -/* - * Danish resources for oleaut32 - * - * Copyright 2003 Jon Griffiths - * - * 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_DANISH, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_TRUE "Sand" - IDS_FALSE "Falsk" - IDS_YES "Ja" - IDS_NO "Nej" - IDS_ON "Til" - IDS_OFF "Fra" -} +/* + * Danish resources for oleaut32 + * + * Copyright 2003 Jon Griffiths + * + * 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_DANISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TRUE "Sand" + IDS_FALSE "Falsk" + IDS_YES "Ja" + IDS_NO "Nej" + IDS_ON "Til" + IDS_OFF "Fra" +} Property changes on: trunk/reactos/lib/oleaut32/oleaut32_Dk.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/oleaut32/oleaut32_En.rc --- trunk/reactos/lib/oleaut32/oleaut32_En.rc 2005-10-08 17:05:40 UTC (rev 18341) +++ trunk/reactos/lib/oleaut32/oleaut32_En.rc 2005-10-08 17:10:59 UTC (rev 18342) @@ -1,31 +1,31 @@ -/* - * English resources for oleaut32 - * - * Copyright 2003 Jon Griffiths - * - * 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_ENGLISH, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_TRUE "True" - IDS_FALSE "False" - IDS_YES "Yes" - IDS_NO "No" - IDS_ON "On" - IDS_OFF "Off" -} +/* + * English resources for oleaut32 + * + * Copyright 2003 Jon Griffiths + * + * 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_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TRUE "True" + IDS_FALSE "False" + IDS_YES "Yes" + IDS_NO "No" + IDS_ON "On" + IDS_OFF "Off" +} Property changes on: trunk/reactos/lib/oleaut32/oleaut32_En.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/oleaut32/oleaut32_Es.rc --- trunk/reactos/lib/oleaut32/oleaut32_Es.rc 2005-10-08 17:05:40 UTC (rev 18341) +++ trunk/reactos/lib/oleaut32/oleaut32_Es.rc 2005-10-08 17:10:59 UTC (rev 18342) @@ -1,31 +1,31 @@ -/* - * Spanish resources for oleaut32 - * - * Copyright 2003 Jon Griffiths - * - * 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_SPANISH, SUBLANG_NEUTRAL - -STRINGTABLE DISCARDABLE -{ - IDS_TRUE "Verdadero" - IDS_FALSE "Falso" - IDS_YES "SÝ" - IDS_NO "No" - IDS_ON "Activado" - IDS_OFF "Desactivado" -} +/* + * Spanish resources for oleaut32 + * + * Copyright 2003 Jon Griffiths + * + * 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_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_TRUE "Verdadero" + IDS_FALSE "Falso" + IDS_YES "SÝ" + IDS_NO "No" + IDS_ON "Activado" + IDS_OFF "Desactivado" +} Property changes on: trunk/reactos/lib/oleaut32/oleaut32_Es.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/oleaut32/oleaut32_Fr.rc --- trunk/reactos/lib/oleaut32/oleaut32_Fr.rc 2005-10-08 17:05:40 UTC (rev 18341) +++ trunk/reactos/lib/oleaut32/oleaut32_Fr.rc 2005-10-08 17:10:59 UTC (rev 18342) @@ -1,31 +1,31 @@ -/* - * French resources for oleaut32 - * - * Copyright 2003 Jon Griffiths - * - * 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_FRENCH, SUBLANG_NEUTRAL - -STRINGTABLE DISCARDABLE -{ - IDS_TRUE "Vrai" - IDS_FALSE "Faux" - IDS_YES "Oui" - IDS_NO "Non" - IDS_ON "Actif" - IDS_OFF "Inactif" -} +/* + * French resources for oleaut32 + * + * Copyright 2003 Jon Griffiths + * + * 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_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_TRUE "Vrai" + IDS_FALSE "Faux" + IDS_YES "Oui" + IDS_NO "Non" + IDS_ON "Actif" + IDS_OFF "Inactif" +} Property changes on: trunk/reactos/lib/oleaut32/oleaut32_Fr.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/oleaut32/oleaut32_Hu.rc --- trunk/reactos/lib/oleaut32/oleaut32_Hu.rc 2005-10-08 17:05:40 UTC (rev 18341) +++ trunk/reactos/lib/oleaut32/oleaut32_Hu.rc 2005-10-08 17:10:59 UTC (rev 18342) @@ -1,31 +1,31 @@ -/* - * Hungarian resources for oleaut32 - * - * Copyright 2003 Jon Griffiths - * - * 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_TRUE "Igaz" - IDS_FALSE "Hamis" - IDS_YES "Igen" - IDS_NO "Nem" - IDS_ON "Be" - IDS_OFF "Ki" -} +/* + * Hungarian resources for oleaut32 + * + * Copyright 2003 Jon Griffiths + * + * 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_TRUE "Igaz" + IDS_FALSE "Hamis" + IDS_YES "Igen" + IDS_NO "Nem" + IDS_ON "Be" + IDS_OFF "Ki" +} Property changes on: trunk/reactos/lib/oleaut32/oleaut32_Hu.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/oleaut32/oleaut32_It.rc --- trunk/reactos/lib/oleaut32/oleaut32_It.rc 2005-10-08 17:05:40 UTC (rev 18341) +++ trunk/reactos/lib/oleaut32/oleaut32_It.rc 2005-10-08 17:10:59 UTC (rev 18342) @@ -1,31 +1,31 @@ -/* - * Italian resources for oleaut32 - * - * Copyright 2003 Jon Griffiths - * - * 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_ITALIAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_TRUE "Vero" - IDS_FALSE "Falso" - IDS_YES "Si" - IDS_NO "No" - IDS_ON "On" - IDS_OFF "Off" -} +/* + * Italian resources for oleaut32 + * + * Copyright 2003 Jon Griffiths + * + * 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_ITALIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TRUE "Vero" + IDS_FALSE "Falso" + IDS_YES "Si" + IDS_NO "No" + IDS_ON "On" + IDS_OFF "Off" +} Property changes on: trunk/reactos/lib/oleaut32/oleaut32_It.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/oleaut32/oleaut32_Nl.rc --- trunk/reactos/lib/oleaut32/oleaut32_Nl.rc 2005-10-08 17:05:40 UTC (rev 18341) +++ trunk/reactos/lib/oleaut32/oleaut32_Nl.rc 2005-10-08 17:10:59 UTC (rev 18342) @@ -1,31 +1,31 @@ -/* - * Dutch resources for oleaut32 - * - * Copyright 2003 Jon Griffiths - * - * 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_DUTCH, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_TRUE "Waar" - IDS_FALSE "Onwaar" - IDS_YES "Ja" - IDS_NO "Nee" - IDS_ON "Aan" - IDS_OFF "Uit" -} +/* + * Dutch resources for oleaut32 + * + * Copyright 2003 Jon Griffiths + * + * 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_DUTCH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TRUE "Waar" + IDS_FALSE "Onwaar" + IDS_YES "Ja" + IDS_NO "Nee" + IDS_ON "Aan" + IDS_OFF "Uit" +} Property changes on: trunk/reactos/lib/oleaut32/oleaut32_Nl.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/oleaut32/oleaut32_No.rc [truncated at 1000 lines; 949 more skipped]

19 years, 2 months

[greatlrd] 18341: sync to Wine-20050930 dsound does not have hardware acclation it is still hardcode to software mode.

by greatlrd＠svn.reactos.com

sync to Wine-20050930 dsound does not have hardware acclation it is still hardcode to software mode. Modified: trunk/reactos/lib/dsound/buffer.c Modified: trunk/reactos/lib/dsound/capture.c Modified: trunk/reactos/lib/dsound/dsound.c Modified: trunk/reactos/lib/dsound/dsound.spec Modified: trunk/reactos/lib/dsound/dsound.xml Modified: trunk/reactos/lib/dsound/dsound_main.c Modified: trunk/reactos/lib/dsound/dsound_private.h Added: trunk/reactos/lib/dsound/duplex.c Modified: trunk/reactos/lib/dsound/mixer.c Modified: trunk/reactos/lib/dsound/primary.c Modified: trunk/reactos/lib/dsound/propset.c Modified: trunk/reactos/lib/dsound/sound3d.c Modified: trunk/reactos/lib/dsound/tests/Makefile.in Modified: trunk/reactos/lib/dsound/tests/capture.c Modified: trunk/reactos/lib/dsound/tests/ds3d.c Modified: trunk/reactos/lib/dsound/tests/ds3d8.c Modified: trunk/reactos/lib/dsound/tests/dsound.c Modified: trunk/reactos/lib/dsound/tests/dsound8.c Modified: trunk/reactos/lib/dsound/tests/dsound_test.h Modified: trunk/reactos/lib/dsound/tests/propset.c Modified: trunk/reactos/lib/dsound/version.rc _____ Modified: trunk/reactos/lib/dsound/buffer.c --- trunk/reactos/lib/dsound/buffer.c 2005-10-08 16:45:47 UTC (rev 18340) +++ trunk/reactos/lib/dsound/buffer.c 2005-10-08 17:05:40 UTC (rev 18341) @@ -1,1562 +1,1511 @@ -/* DirectSound - * - * Copyright 1998 Marcus Meissner - * Copyright 1998 Rob Riggs - * Copyright 2000-2002 TransGaming Technologies, Inc. - * - * 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 - */ - -#include "config.h" -#include <assert.h> -#include <stdarg.h> -#include <stdio.h> -#include <sys/types.h> -#include <sys/fcntl.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -#include <stdlib.h> -#include <string.h> -#include <math.h> - -#define NONAMELESSSTRUCT -#define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winerror.h" -#include "mmsystem.h" -#include "winreg.h" -#include "winternl.h" -#include "mmddk.h" -#include "wine/windef16.h" -#include "wine/debug.h" -#include "dsound.h" -#include "dsdriver.h" -#include "dsound_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dsound); - -/********************************************************************** ********* - * IDirectSoundNotify - */ -static HRESULT WINAPI IDirectSoundNotifyImpl_QueryInterface( - LPDIRECTSOUNDNOTIFY iface,REFIID riid,LPVOID *ppobj -) { - IDirectSoundNotifyImpl *This = (IDirectSoundNotifyImpl *)iface; - TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); - - if (This->dsb == NULL) { - WARN("invalid parameter\n"); - return E_INVALIDARG; - } - - return IDirectSoundBuffer_QueryInterface((LPDIRECTSOUNDBUFFER)This->dsb, riid, ppobj); -} - -static ULONG WINAPI IDirectSoundNotifyImpl_AddRef(LPDIRECTSOUNDNOTIFY iface) -{ - IDirectSoundNotifyImpl *This = (IDirectSoundNotifyImpl *)iface; - TRACE("(%p) ref was %ld, thread is %04lx\n",This, This->ref, GetCurrentThreadId()); - return InterlockedIncrement(&(This->ref)); -} - -static ULONG WINAPI IDirectSoundNotifyImpl_Release(LPDIRECTSOUNDNOTIFY iface) { - IDirectSoundNotifyImpl *This = (IDirectSoundNotifyImpl *)iface; - ULONG ref; - - TRACE("(%p) ref was %ld, thread is %04lx\n",This, This->ref, GetCurrentThreadId()); - - ref = InterlockedDecrement(&(This->ref)); - if (ref == 0) { - IDirectSoundBuffer_Release((LPDIRECTSOUNDBUFFER)This->dsb); - This->dsb->notify = NULL; - HeapFree(GetProcessHeap(),0,This); - TRACE("(%p) released\n",This); - } - return ref; -} - -static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions( - LPDIRECTSOUNDNOTIFY iface,DWORD howmuch,LPCDSBPOSITIONNOTIFY notify -) { - IDirectSoundNotifyImpl *This = (IDirectSoundNotifyImpl *)iface; - TRACE("(%p,0x%08lx,%p)\n",This,howmuch,notify); - - if (howmuch > 0 && notify == NULL) { - WARN("invalid parameter: notify == NULL\n"); - return DSERR_INVALIDPARAM; - } - - if (TRACE_ON(dsound)) { - unsigned int i; - for (i=0;i<howmuch;i++) - TRACE("notify at %ld to 0x%08lx\n", - notify[i].dwOffset,(DWORD)notify[i].hEventNotify); - } - - if (This->dsb->hwnotify) { - HRESULT hres; - hres = IDsDriverNotify_SetNotificationPositions(This->dsb->hwnotify, howmuch, notify); - if (hres != DS_OK) - WARN("IDsDriverNotify_SetNotificationPositions failed\n"); - return hres; - } else if (howmuch > 0) { - /* Make an internal copy of the caller-supplied array. - * Replace the existing copy if one is already present. */ - if (This->dsb->notifies) - This->dsb->notifies = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - This->dsb->notifies, howmuch * sizeof(DSBPOSITIONNOTIFY)); - else - This->dsb->notifies = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - howmuch * sizeof(DSBPOSITIONNOTIFY)); - - if (This->dsb->notifies == NULL) { - WARN("out of memory\n"); - return DSERR_OUTOFMEMORY; - } - memcpy(This->dsb->notifies, notify, howmuch * sizeof(DSBPOSITIONNOTIFY)); - This->dsb->nrofnotifies = howmuch; - } else { - if (This->dsb->notifies) { - HeapFree(GetProcessHeap(), 0, This->dsb->notifies); - This->dsb->notifies = NULL; - } - This->dsb->nrofnotifies = 0; - } - - return S_OK; -} - -IDirectSoundNotifyVtbl dsnvt = -{ - IDirectSoundNotifyImpl_QueryInterface, - IDirectSoundNotifyImpl_AddRef, - IDirectSoundNotifyImpl_Release, - IDirectSoundNotifyImpl_SetNotificationPositions, -}; - -HRESULT WINAPI IDirectSoundNotifyImpl_Create( - IDirectSoundBufferImpl * dsb, - IDirectSoundNotifyImpl **pdsn) -{ - IDirectSoundNotifyImpl * dsn; - TRACE("(%p,%p)\n",dsb,pdsn); - - dsn = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(dsn)); - - if (dsn == NULL) { - WARN("out of memory\n"); - return DSERR_OUTOFMEMORY; - } - - dsn->ref = 0; - dsn->lpVtbl = &dsnvt; - dsn->dsb = dsb; - dsb->notify = dsn; - IDirectSoundBuffer_AddRef((LPDIRECTSOUNDBUFFER)dsb); - - *pdsn = dsn; - return DS_OK; -} - -HRESULT WINAPI IDirectSoundNotifyImpl_Destroy( - IDirectSoundNotifyImpl *pdsn) -{ - TRACE("(%p)\n",pdsn); - - while (IDirectSoundNotifyImpl_Release((LPDIRECTSOUNDNOTIFY)pdsn) > 0); - - return DS_OK; -} - -/********************************************************************** ********* - * IDirectSoundBuffer - */ - -static HRESULT WINAPI IDirectSoundBufferImpl_SetFormat( - LPDIRECTSOUNDBUFFER8 iface,LPCWAVEFORMATEX wfex -) { - IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; - - TRACE("(%p,%p)\n",This,wfex); - /* This method is not available on secondary buffers */ - WARN("invalid call\n"); - return DSERR_INVALIDCALL; -} - -static HRESULT WINAPI IDirectSoundBufferImpl_SetVolume( - LPDIRECTSOUNDBUFFER8 iface,LONG vol -) { - IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; - LONG oldVol; - HRESULT hres = DS_OK; - - TRACE("(%p,%ld)\n",This,vol); - - if (!(This->dsbd.dwFlags & DSBCAPS_CTRLVOLUME)) { - WARN("control unavailable: This->dsbd.dwFlags = 0x%08lx\n", This->dsbd.dwFlags); - return DSERR_CONTROLUNAVAIL; - } - - if ((vol > DSBVOLUME_MAX) || (vol < DSBVOLUME_MIN)) { - WARN("invalid parameter: vol = %ld\n", vol); - return DSERR_INVALIDPARAM; - } - - /* **** */ - EnterCriticalSection(&(This->lock)); - - if (This->dsbd.dwFlags & DSBCAPS_CTRL3D) { - oldVol = This->ds3db_lVolume; - This->ds3db_lVolume = vol; - } else { - oldVol = This->volpan.lVolume; - This->volpan.lVolume = vol; - if (vol != oldVol) - DSOUND_RecalcVolPan(&(This->volpan)); - } - - if (vol != oldVol) { - if (This->hwbuf) { - hres = IDsDriverBuffer_SetVolumePan(This->hwbuf, &(This->volpan)); - if (hres != DS_OK) - WARN("IDsDriverBuffer_SetVolumePan failed\n"); - } else - DSOUND_ForceRemix(This); - } - - LeaveCriticalSection(&(This->lock)); - /* **** */ - - return hres; -} - -static HRESULT WINAPI IDirectSoundBufferImpl_GetVolume( - LPDIRECTSOUNDBUFFER8 iface,LPLONG vol -) { - IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; - TRACE("(%p,%p)\n",This,vol); - - if (!(This->dsbd.dwFlags & DSBCAPS_CTRLVOLUME)) { - WARN("control unavailable\n"); - return DSERR_CONTROLUNAVAIL; - } - - if (vol == NULL) { - WARN("invalid parameter: vol == NULL\n"); - return DSERR_INVALIDPARAM; - } - - *vol = This->volpan.lVolume; - - return DS_OK; -} - -static HRESULT WINAPI IDirectSoundBufferImpl_SetFrequency( - LPDIRECTSOUNDBUFFER8 iface,DWORD freq -) { - IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; - DWORD oldFreq; - - TRACE("(%p,%ld)\n",This,freq); - - if (!(This->dsbd.dwFlags & DSBCAPS_CTRLFREQUENCY)) { - WARN("control unavailable\n"); - return DSERR_CONTROLUNAVAIL; - } - - if (freq == DSBFREQUENCY_ORIGINAL) - freq = This->pwfx->nSamplesPerSec; - - if ((freq < DSBFREQUENCY_MIN) || (freq > DSBFREQUENCY_MAX)) { - WARN("invalid parameter: freq = %ld\n", freq); - return DSERR_INVALIDPARAM; - } - - /* **** */ - EnterCriticalSection(&(This->lock)); - - oldFreq = This->freq; - This->freq = freq; - if (freq != oldFreq) { - This->freqAdjust = (freq << DSOUND_FREQSHIFT) / This->dsound->pwfx->nSamplesPerSec; - This->nAvgBytesPerSec = freq * This->pwfx->nBlockAlign; - DSOUND_RecalcFormat(This); - if (!This->hwbuf) - DSOUND_ForceRemix(This); - } - - LeaveCriticalSection(&(This->lock)); - /* **** */ - - return DS_OK; -} - -static HRESULT WINAPI IDirectSoundBufferImpl_Play( - LPDIRECTSOUNDBUFFER8 iface,DWORD reserved1,DWORD reserved2,DWORD flags -) { - HRESULT hres = DS_OK; - IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; - TRACE("(%p,%08lx,%08lx,%08lx)\n",This,reserved1,reserved2,flags); - - /* **** */ - EnterCriticalSection(&(This->lock)); - - This->playflags = flags; - if (This->state == STATE_STOPPED) { - This->leadin = TRUE; - This->startpos = This->buf_mixpos; - This->state = STATE_STARTING; - } else if (This->state == STATE_STOPPING) - This->state = STATE_PLAYING; - if (This->hwbuf) { - hres = IDsDriverBuffer_Play(This->hwbuf, 0, 0, This->playflags); - if (hres != DS_OK) - WARN("IDsDriverBuffer_Play failed\n"); - else - This->state = STATE_PLAYING; - } - - LeaveCriticalSection(&(This->lock)); - /* **** */ - - return hres; -} - -static HRESULT WINAPI IDirectSoundBufferImpl_Stop(LPDIRECTSOUNDBUFFER8 iface) -{ - HRESULT hres = DS_OK; - IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; - TRACE("(%p)\n",This); - - /* **** */ - EnterCriticalSection(&(This->lock)); - - if (This->state == STATE_PLAYING) - This->state = STATE_STOPPING; - else if (This->state == STATE_STARTING) - This->state = STATE_STOPPED; - if (This->hwbuf) { - hres = IDsDriverBuffer_Stop(This->hwbuf); - if (hres != DS_OK) - WARN("IDsDriverBuffer_Stop failed\n"); - else - This->state = STATE_STOPPED; - } - DSOUND_CheckEvent(This, 0); - - LeaveCriticalSection(&(This->lock)); - /* **** */ - - return hres; -} - -static ULONG WINAPI IDirectSoundBufferImpl_AddRef(LPDIRECTSOUNDBUFFER8 iface) -{ - IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; - TRACE("(%p) ref was %ld, thread is %04lx\n",This, This->ref, GetCurrentThreadId()); - return InterlockedIncrement(&(This->ref)); -} - -static ULONG WINAPI IDirectSoundBufferImpl_Release(LPDIRECTSOUNDBUFFER8 iface) -{ - IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; - ULONG ref; - - TRACE("(%p) ref was %ld, thread is %04lx\n",This, This->ref, GetCurrentThreadId()); - - ref = InterlockedDecrement(&(This->ref)); - if (ref) - return ref; - - DSOUND_RemoveBuffer(This->dsound, This); - - This->lock.DebugInfo->Spare[1] = 0; - DeleteCriticalSection(&(This->lock)); - - if (This->hwbuf) { - IDsDriverBuffer_Release(This->hwbuf); - if (This->dsound->drvdesc.dwFlags & DSDDESC_USESYSTEMMEMORY) { - This->buffer->ref--; - if (This->buffer->ref==0) { - HeapFree(GetProcessHeap(),0,This->buffer->memory); - HeapFree(GetProcessHeap(),0,This->buffer); - } - } - } else { - This->buffer->ref--; - if (This->buffer->ref==0) { - HeapFree(GetProcessHeap(),0,This->buffer->memory); - HeapFree(GetProcessHeap(),0,This->buffer); - } - } - - if (This->notifies != NULL) - HeapFree(GetProcessHeap(), 0, This->notifies); - - if (This->pwfx) - HeapFree(GetProcessHeap(), 0, This->pwfx); - - HeapFree(GetProcessHeap(),0,This); - - TRACE("(%p) released\n",This); - return 0; -} - -DWORD DSOUND_CalcPlayPosition(IDirectSoundBufferImpl *This, - DWORD state, DWORD pplay, DWORD pwrite, DWORD pmix, DWORD bmix) -{ - DWORD bplay; - - TRACE("primary playpos=%ld, mixpos=%ld\n", pplay, pmix); - TRACE("this mixpos=%ld, time=%ld\n", bmix, GetTickCount()); - - /* the actual primary play position (pplay) is always behind last mixed (pmix), - * unless the computer is too slow or something */ - /* we need to know how far away we are from there */ -#if 0 /* we'll never fill the primary entirely */ - if (pmix == pplay) { - if ((state == STATE_PLAYING) || (state == STATE_STOPPING)) { - /* wow, the software mixer is really doing well, - * seems the entire primary buffer is filled! */ - pmix += This->dsound->buflen; - } - /* else: the primary buffer is not playing, so probably empty */ - } -#endif - if (pmix < pplay) pmix += This->dsound->buflen; /* wraparound */ - pmix -= pplay; - /* detect buffer underrun */ - if (pwrite < pplay) pwrite += This->dsound->buflen; /* wraparound */ - pwrite -= pplay; - if (pmix > (ds_snd_queue_max * This->dsound->fraglen + pwrite + This->dsound->writelead)) { - WARN("detected an underrun: primary queue was %ld\n",pmix); - pmix = 0; - } - /* divide the offset by its sample size */ - pmix /= This->dsound->pwfx->nBlockAlign; - TRACE("primary back-samples=%ld\n",pmix); - /* adjust for our frequency */ - pmix = (pmix * This->freqAdjust) >> DSOUND_FREQSHIFT; - /* multiply by our own sample size */ - pmix *= This->pwfx->nBlockAlign; - TRACE("this back-offset=%ld\n", pmix); - /* subtract from our last mixed position */ - bplay = bmix; - while (bplay < pmix) bplay += This->buflen; /* wraparound */ - bplay -= pmix; - if (This->leadin && ((bplay < This->startpos) || (bplay > bmix))) { - /* seems we haven't started playing yet */ - TRACE("this still in lead-in phase\n"); - bplay = This->startpos; - } - /* return the result */ - return bplay; -} - -static HRESULT WINAPI IDirectSoundBufferImpl_GetCurrentPosition( - LPDIRECTSOUNDBUFFER8 iface,LPDWORD playpos,LPDWORD writepos -) { - HRESULT hres; - IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; - TRACE("(%p,%p,%p)\n",This,playpos,writepos); - if (This->hwbuf) { - hres=IDsDriverBuffer_GetPosition(This->hwbuf,playpos,writepos); - if (hres != DS_OK) { - WARN("IDsDriverBuffer_GetPosition failed\n"); - return hres; - } - } else { - if (playpos && (This->state != STATE_PLAYING)) { - /* we haven't been merged into the primary buffer (yet) */ - *playpos = This->buf_mixpos; - } else if (playpos) { - DWORD pplay, pwrite, lplay, splay, pstate; - /* let's get this exact; first, recursively call GetPosition on the primary */ - EnterCriticalSection(&(This->dsound->mixlock)); - if (DSOUND_PrimaryGetPosition(This->dsound, &pplay, &pwrite) != DS_OK) - WARN("DSOUND_PrimaryGetPosition failed\n"); - /* detect HEL mode underrun */ - pstate = This->dsound->state; - if (!(This->dsound->hwbuf || This->dsound->pwqueue)) { - TRACE("detected an underrun\n"); - /* pplay = ? */ - if (pstate == STATE_PLAYING) - pstate = STATE_STARTING; - else if (pstate == STATE_STOPPING) - pstate = STATE_STOPPED; - } - /* get data for ourselves while we still have the lock */ - pstate &= This->state; - lplay = This->primary_mixpos; - splay = This->buf_mixpos; - if ((This->dsbd.dwFlags & DSBCAPS_GETCURRENTPOSITION2) || This->dsound->hwbuf) { - /* calculate play position using this */ - *playpos = DSOUND_CalcPlayPosition(This, pstate, pplay, pwrite, lplay, splay); - } else { - /* (unless the app isn't using GETCURRENTPOSITION2) */ - /* don't know exactly how this should be handled... - * the docs says that play cursor is reported as directly - * behind write cursor, hmm... */ - /* let's just do what might work for Half-Life */ - DWORD wp; - wp = (This->dsound->pwplay + ds_hel_margin) * This->dsound->fraglen; - wp %= This->dsound->buflen; - *playpos = DSOUND_CalcPlayPosition(This, pstate, wp, pwrite, lplay, splay); - } - LeaveCriticalSection(&(This->dsound->mixlock)); - } - if (writepos) - *writepos = This->buf_mixpos; - } - if (writepos) { - if (This->state != STATE_STOPPED) { - /* apply the documented 10ms lead to writepos */ - *writepos += This->writelead; - } - *writepos %= This->buflen; - } - if (playpos) - This->last_playpos = *playpos; - TRACE("playpos = %ld, writepos = %ld (%p, time=%ld)\n", playpos?*playpos:0, writepos?*writepos:0, This, GetTickCount()); - return DS_OK; -} - -static HRESULT WINAPI IDirectSoundBufferImpl_GetStatus( - LPDIRECTSOUNDBUFFER8 iface,LPDWORD status -) { - IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; - TRACE("(%p,%p), thread is %04lx\n",This,status,GetCurrentThreadId()); - - if (status == NULL) { - WARN("invalid parameter: status = NULL\n"); - return DSERR_INVALIDPARAM; - } - - *status = 0; - if ((This->state == STATE_STARTING) || (This->state == STATE_PLAYING)) { - *status |= DSBSTATUS_PLAYING; - if (This->playflags & DSBPLAY_LOOPING) - *status |= DSBSTATUS_LOOPING; - } - - TRACE("status=%lx\n", *status); - return DS_OK; -} - - -static HRESULT WINAPI IDirectSoundBufferImpl_GetFormat( - LPDIRECTSOUNDBUFFER8 iface, - LPWAVEFORMATEX lpwf, - DWORD wfsize, - LPDWORD wfwritten) -{ - DWORD size; - IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; - TRACE("(%p,%p,%ld,%p)\n",This,lpwf,wfsize,wfwritten); - - size = sizeof(WAVEFORMATEX) + This->pwfx->cbSize; - - if (lpwf) { /* NULL is valid */ - if (wfsize >= size) { - memcpy(lpwf,This->pwfx,size); - if (wfwritten) - *wfwritten = size; - } else { - WARN("invalid parameter: wfsize to small\n"); - if (wfwritten) - *wfwritten = 0; - return DSERR_INVALIDPARAM; - } - } else { - if (wfwritten) - *wfwritten = sizeof(WAVEFORMATEX) + This->pwfx->cbSize; - else { - WARN("invalid parameter: wfwritten == NULL\n"); - return DSERR_INVALIDPARAM; - } - } - - return DS_OK; -} - -static HRESULT WINAPI IDirectSoundBufferImpl_Lock( - LPDIRECTSOUNDBUFFER8 iface,DWORD writecursor,DWORD writebytes,LPVOID lplpaudioptr1,LPDWORD audiobytes1,LPVOID lplpaudioptr2,LPDWORD audiobytes2,DWORD flags -) { - HRESULT hres = DS_OK; - IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; - - TRACE("(%p,%ld,%ld,%p,%p,%p,%p,0x%08lx) at %ld\n", - This, - writecursor, - writebytes, - lplpaudioptr1, - audiobytes1, - lplpaudioptr2, - audiobytes2, - flags, - GetTickCount() - ); - - if (flags & DSBLOCK_FROMWRITECURSOR) { - DWORD writepos; - /* GetCurrentPosition does too much magic to duplicate here */ - hres = IDirectSoundBufferImpl_GetCurrentPosition(iface, NULL, &writepos); - if (hres != DS_OK) { - WARN("IDirectSoundBufferImpl_GetCurrentPosition failed\n"); - return hres; - } - writecursor += writepos; - } - writecursor %= This->buflen; - if (flags & DSBLOCK_ENTIREBUFFER) - writebytes = This->buflen; - if (writebytes > This->buflen) - writebytes = This->buflen; - - EnterCriticalSection(&(This->lock)); - - if ((writebytes == This->buflen) && - ((This->state == STATE_STARTING) || - (This->state == STATE_PLAYING))) - /* some games, like Half-Life, try to be clever (not) and - * keep one secondary buffer, and mix sounds into it itself, - * locking the entire buffer every time... so we can just forget - * about tracking the last-written-to-position... */ - This->probably_valid_to = (DWORD)-1; - else - This->probably_valid_to = writecursor; - - if (!(This->dsound->drvdesc.dwFlags & DSDDESC_DONTNEEDSECONDARYLOCK) && This->hwbuf) { - hres = IDsDriverBuffer_Lock(This->hwbuf, - lplpaudioptr1, audiobytes1, - lplpaudioptr2, audiobytes2, - writecursor, writebytes, - 0); - if (hres != DS_OK) { - WARN("IDsDriverBuffer_Lock failed\n"); - LeaveCriticalSection(&(This->lock)); - return hres; - } - } else { - BOOL remix = FALSE; - if (writecursor+writebytes <= This->buflen) { - *(LPBYTE*)lplpaudioptr1 = This->buffer->memory+writecursor; - *audiobytes1 = writebytes; - if (lplpaudioptr2) - *(LPBYTE*)lplpaudioptr2 = NULL; - if (audiobytes2) - *audiobytes2 = 0; - TRACE("->%ld.0\n",writebytes); - } else { - *(LPBYTE*)lplpaudioptr1 = This->buffer->memory+writecursor; - *audiobytes1 = This->buflen-writecursor; - if (lplpaudioptr2) - *(LPBYTE*)lplpaudioptr2 = This->buffer->memory; - if (audiobytes2) - *audiobytes2 = writebytes-(This->buflen-writecursor); - TRACE("->%ld.%ld\n",*audiobytes1,audiobytes2?*audiobytes2:0); - } - if (This->state == STATE_PLAYING) { - /* if the segment between playpos and buf_mixpos is touched, - * we need to cancel some mixing */ - /* we'll assume that the app always calls GetCurrentPosition before - * locking a playing buffer, so that last_playpos is up-to-date */ - if (This->buf_mixpos >= This->last_playpos) { - if (This->buf_mixpos > writecursor && - This->last_playpos < writecursor+writebytes) - remix = TRUE; - } else { - if (This->buf_mixpos > writecursor || - This->last_playpos < writecursor+writebytes) - remix = TRUE; - } - if (remix) { - TRACE("locking prebuffered region, ouch\n"); - DSOUND_MixCancelAt(This, writecursor); - } - } - } - - LeaveCriticalSection(&(This->lock)); - return DS_OK; -} - -static HRESULT WINAPI IDirectSoundBufferImpl_SetCurrentPosition( - LPDIRECTSOUNDBUFFER8 iface,DWORD newpos -) { - HRESULT hres = DS_OK; - IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; - TRACE("(%p,%ld)\n",This,newpos); - - /* **** */ - EnterCriticalSection(&(This->lock)); - - newpos %= This->buflen; - This->buf_mixpos = newpos; - if (This->hwbuf) { - hres = IDsDriverBuffer_SetPosition(This->hwbuf, This->buf_mixpos); - if (hres != DS_OK) - WARN("IDsDriverBuffer_SetPosition failed\n"); - } - - LeaveCriticalSection(&(This->lock)); - /* **** */ - - return hres; -} - -static HRESULT WINAPI IDirectSoundBufferImpl_SetPan( - LPDIRECTSOUNDBUFFER8 iface,LONG pan -) { - HRESULT hres = DS_OK; - IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; - - TRACE("(%p,%ld)\n",This,pan); - - if ((pan > DSBPAN_RIGHT) || (pan < DSBPAN_LEFT)) { - WARN("invalid parameter: pan = %ld\n", pan); - return DSERR_INVALIDPARAM; - } - - /* You cannot use both pan and 3D controls */ - if (!(This->dsbd.dwFlags & DSBCAPS_CTRLPAN) || - (This->dsbd.dwFlags & DSBCAPS_CTRL3D)) { - WARN("control unavailable\n"); - return DSERR_CONTROLUNAVAIL; - } - - /* **** */ - EnterCriticalSection(&(This->lock)); - - if (This->volpan.lPan != pan) { - This->volpan.lPan = pan; - DSOUND_RecalcVolPan(&(This->volpan)); - - if (This->hwbuf) { - hres = IDsDriverBuffer_SetVolumePan(This->hwbuf, &(This->volpan)); - if (hres != DS_OK) - WARN("IDsDriverBuffer_SetVolumePan failed\n"); - } else - DSOUND_ForceRemix(This); - } - - LeaveCriticalSection(&(This->lock)); - /* **** */ - - return hres; -} - -static HRESULT WINAPI IDirectSoundBufferImpl_GetPan( - LPDIRECTSOUNDBUFFER8 iface,LPLONG pan -) { - IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; - TRACE("(%p,%p)\n",This,pan); - - if (!(This->dsbd.dwFlags & DSBCAPS_CTRLPAN)) { - WARN("control unavailable\n"); - return DSERR_CONTROLUNAVAIL; - } - - if (pan == NULL) { - WARN("invalid parameter: pan = NULL\n"); - return DSERR_INVALIDPARAM; - } - - *pan = This->volpan.lPan; - - return DS_OK; -} - -static HRESULT WINAPI IDirectSoundBufferImpl_Unlock( - LPDIRECTSOUNDBUFFER8 iface,LPVOID p1,DWORD x1,LPVOID p2,DWORD x2 -) { - IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; - DWORD probably_valid_to; - HRESULT hres = DS_OK; - - TRACE("(%p,%p,%ld,%p,%ld)\n", This,p1,x1,p2,x2); - - /* **** */ - EnterCriticalSection(&(This->lock)); - - if (!(This->dsound->drvdesc.dwFlags & DSDDESC_DONTNEEDSECONDARYLOCK) && This->hwbuf) { - hres = IDsDriverBuffer_Unlock(This->hwbuf, p1, x1, p2, x2); - if (hres != DS_OK) - WARN("IDsDriverBuffer_Unlock failed\n"); - } - - if (hres == DS_OK) { - if (p2) probably_valid_to = (((LPBYTE)p2)-This->buffer->memory) + x2; - else probably_valid_to = (((LPBYTE)p1)-This->buffer->memory) + x1; - probably_valid_to %= This->buflen; - if ((probably_valid_to == 0) && ((x1+x2) == This->buflen) && - ((This->state == STATE_STARTING) || - (This->state == STATE_PLAYING))) - /* see IDirectSoundBufferImpl_Lock */ - probably_valid_to = (DWORD)-1; - This->probably_valid_to = probably_valid_to; - } - - LeaveCriticalSection(&(This->lock)); - /* **** */ - - TRACE("probably_valid_to=%ld\n", This->probably_valid_to); - return hres; -} - -static HRESULT WINAPI IDirectSoundBufferImpl_Restore( - LPDIRECTSOUNDBUFFER8 iface -) { - IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; - FIXME("(%p):stub\n",This); - return DS_OK; -} - -static HRESULT WINAPI IDirectSoundBufferImpl_GetFrequency( - LPDIRECTSOUNDBUFFER8 iface,LPDWORD freq -) { - IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; - TRACE("(%p,%p)\n",This,freq); - - if (freq == NULL) { - WARN("invalid parameter: freq = NULL\n"); - return DSERR_INVALIDPARAM; - } - - *freq = This->freq; - TRACE("-> %ld\n", *freq); - - return DS_OK; -} - -static HRESULT WINAPI IDirectSoundBufferImpl_SetFX( - LPDIRECTSOUNDBUFFER8 iface,DWORD dwEffectsCount,LPDSEFFECTDESC pDSFXDesc,LPDWORD pdwResultCodes -) { - IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; - DWORD u; - - FIXME("(%p,%lu,%p,%p): stub\n",This,dwEffectsCount,pDSFXDesc,pdwResultCodes); - - if (pdwResultCodes) - for (u=0; u<dwEffectsCount; u++) pdwResultCodes[u] = DSFXR_UNKNOWN; - - WARN("control unavailable\n"); - return DSERR_CONTROLUNAVAIL; -} - -static HRESULT WINAPI IDirectSoundBufferImpl_AcquireResources( - LPDIRECTSOUNDBUFFER8 iface,DWORD dwFlags,DWORD dwEffectsCount,LPDWORD pdwResultCodes -) { - IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; - DWORD u; - - FIXME("(%p,%08lu,%lu,%p): stub\n",This,dwFlags,dwEffectsCount,pdwResultCodes); - - if (pdwResultCodes) - for (u=0; u<dwEffectsCount; u++) pdwResultCodes[u] = DSFXR_UNKNOWN; - - WARN("control unavailable\n"); - return DSERR_CONTROLUNAVAIL; -} - -static HRESULT WINAPI IDirectSoundBufferImpl_GetObjectInPath( - LPDIRECTSOUNDBUFFER8 iface,REFGUID rguidObject,DWORD dwIndex,REFGUID rguidInterface,LPVOID* ppObject -) { - IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; - - FIXME("(%p,%s,%lu,%s,%p): stub\n",This,debugstr_guid(rguidObject),dwIndex,debugstr_guid(rguidInter face),ppObject); - - WARN("control unavailable\n"); - return DSERR_CONTROLUNAVAIL; -} - -static HRESULT WINAPI IDirectSoundBufferImpl_Initialize( - LPDIRECTSOUNDBUFFER8 iface,LPDIRECTSOUND dsound,LPCDSBUFFERDESC dbsd -) { - IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; - FIXME("(%p,%p,%p):stub\n",This,dsound,dbsd); - DPRINTF("Re-Init!!!\n"); - WARN("already initialized\n"); - return DSERR_ALREADYINITIALIZED; -} - -static HRESULT WINAPI IDirectSoundBufferImpl_GetCaps( - LPDIRECTSOUNDBUFFER8 iface,LPDSBCAPS caps -) { - IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; - TRACE("(%p)->(%p)\n",This,caps); - - if (caps == NULL) { - WARN("invalid parameter: caps == NULL\n"); - return DSERR_INVALIDPARAM; - } - - if (caps->dwSize < sizeof(*caps)) { - WARN("invalid parameter: caps->dwSize = %ld < %d\n",caps->dwSize, sizeof(*caps)); - return DSERR_INVALIDPARAM; - } - - caps->dwFlags = This->dsbd.dwFlags; - if (This->hwbuf) caps->dwFlags |= DSBCAPS_LOCHARDWARE; - else caps->dwFlags |= DSBCAPS_LOCSOFTWARE; - - caps->dwBufferBytes = This->buflen; - - /* This value represents the speed of the "unlock" command. - As unlock is quite fast (it does not do anything), I put - 4096 ko/s = 4 Mo / s */ - /* FIXME: hwbuf speed */ - caps->dwUnlockTransferRate = 4096; - caps->dwPlayCpuOverhead = 0; - - return DS_OK; -} - -static HRESULT WINAPI IDirectSoundBufferImpl_QueryInterface( - LPDIRECTSOUNDBUFFER8 iface,REFIID riid,LPVOID *ppobj -) { - IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; - - TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); - - if (ppobj == NULL) { - WARN("invalid parameter\n"); - return E_INVALIDARG; - } - - *ppobj = NULL; /* assume failure */ - - if ( IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IDirectSoundBuffer) || - IsEqualGUID(riid, &IID_IDirectSoundBuffer8) ) { - if (!This->dsb) - SecondaryBufferImpl_Create(This, &(This->dsb)); - if (This->dsb) { - IDirectSoundBuffer8_AddRef((LPDIRECTSOUNDBUFFER8)This->dsb); - *ppobj = This->dsb; - return S_OK; - } - WARN("IID_IDirectSoundBuffer\n"); - return E_NOINTERFACE; - } - - if ( IsEqualGUID( &IID_IDirectSoundNotify, riid ) ) { - if (!This->notify) - IDirectSoundNotifyImpl_Create(This, &(This->notify)); - if (This->notify) { - IDirectSoundNotify_AddRef((LPDIRECTSOUNDNOTIFY)This->notify); - *ppobj = This->notify; - return S_OK; - } - WARN("IID_IDirectSoundNotify\n"); - return E_NOINTERFACE; - } - - if ( IsEqualGUID( &IID_IDirectSound3DBuffer, riid ) ) { - if (!This->ds3db) - IDirectSound3DBufferImpl_Create(This, &(This->ds3db)); - if (This->ds3db) { - IDirectSound3DBuffer_AddRef((LPDIRECTSOUND3DBUFFER)This->ds3db); - *ppobj = This->ds3db; - return S_OK; - } - WARN("IID_IDirectSound3DBuffer\n"); - return E_NOINTERFACE; - } - - if ( IsEqualGUID( &IID_IDirectSound3DListener, riid ) ) { - ERR("app requested IDirectSound3DListener on secondary buffer\n"); - return E_NOINTERFACE; - } - - if ( IsEqualGUID( &IID_IKsPropertySet, riid ) ) { - if (!This->iks) - IKsBufferPropertySetImpl_Create(This, &(This->iks)); - if (This->iks) { - IKsPropertySet_AddRef((LPKSPROPERTYSET)This->iks); - *ppobj = This->iks; - return S_OK; - } [truncated at 1000 lines; 30241 more skipped]

19 years, 2 months

[greatlrd] 18340: remove to file that was mistake by commit by me thx

by greatlrd＠svn.reactos.com

remove to file that was mistake by commit by me thx Mike Lerwill" <mlist(a)ml-solutions.co.uk> that did notice it Deleted: trunk/reactos/lib/dinput/Makefile.in Deleted: trunk/reactos/lib/dinput/makefile _____ Deleted: trunk/reactos/lib/dinput/Makefile.in --- trunk/reactos/lib/dinput/Makefile.in 2005-10-08 16:38:07 UTC (rev 18339) +++ trunk/reactos/lib/dinput/Makefile.in 2005-10-08 16:45:47 UTC (rev 18340) @@ -1,28 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = dinput.dll -IMPORTLIB = libdinput.$(IMPLIBEXT) -IMPORTS = ole32 user32 advapi32 kernel32 -EXTRALIBS = -ldxguid -luuid - -C_SRCS = \ - data_formats.c \ - device.c \ - dinput_main.c \ - joystick_linux.c \ - joystick_linuxinput.c \ - keyboard.c \ - mouse.c \ - regsvr.c - -IMPLIB_SRCS = data_formats.c - -RC_SRCS = version.rc - -SUBDIRS = tests - -@MAKE_DLL_RULES@ - -### Dependencies: _____ Deleted: trunk/reactos/lib/dinput/makefile --- trunk/reactos/lib/dinput/makefile 2005-10-08 16:38:07 UTC (rev 18339) +++ trunk/reactos/lib/dinput/makefile 2005-10-08 16:45:47 UTC (rev 18340) @@ -1,5 +0,0 @@ -# This file is automatically generated. - -TOP = ..\.. -DEFAULT = dinput -include $(TOP)/proxy.mak

19 years, 2 months

[greatlrd] 18339: Dsound from win 2004 month 12 or month 11. It is working in windows 2000 in software emulation mode. Tested with quake2 and some other apps. Not tested in ReactOS

by greatlrd＠svn.reactos.com

Dsound from win 2004 month 12 or month 11. It is working in windows 2000 in software emulation mode. Tested with quake2 and some other apps. Not tested in ReactOS Added: trunk/reactos/lib/dsound/buffer.c Added: trunk/reactos/lib/dsound/capture.c Modified: trunk/reactos/lib/dsound/dsound.c Deleted: trunk/reactos/lib/dsound/dsound.def Added: trunk/reactos/lib/dsound/dsound.spec Modified: trunk/reactos/lib/dsound/dsound.xml Added: trunk/reactos/lib/dsound/dsound_main.c Added: trunk/reactos/lib/dsound/dsound_private.h Added: trunk/reactos/lib/dsound/dxroslayer/ Added: trunk/reactos/lib/dsound/dxroslayer/dxros_layer.h Added: trunk/reactos/lib/dsound/dxroslayer/dxrosdrv_querydsounddesc.c Added: trunk/reactos/lib/dsound/dxroslayer/dxrosdrv_querydsoundiface.c Added: trunk/reactos/lib/dsound/dxroslayer/dxroslayer.c Added: trunk/reactos/lib/dsound/dxroslayer/getguidfromstring.c Added: trunk/reactos/lib/dsound/mixer.c Added: trunk/reactos/lib/dsound/primary.c Added: trunk/reactos/lib/dsound/propset.c Added: trunk/reactos/lib/dsound/regsvr.c Added: trunk/reactos/lib/dsound/sound3d.c Added: trunk/reactos/lib/dsound/tests/ Added: trunk/reactos/lib/dsound/tests/.cvsignore Added: trunk/reactos/lib/dsound/tests/Makefile.in Added: trunk/reactos/lib/dsound/tests/capture.c Added: trunk/reactos/lib/dsound/tests/ds3d.c Added: trunk/reactos/lib/dsound/tests/ds3d8.c Added: trunk/reactos/lib/dsound/tests/dsound.c Added: trunk/reactos/lib/dsound/tests/dsound8.c Added: trunk/reactos/lib/dsound/tests/dsound_test.h Added: trunk/reactos/lib/dsound/tests/propset.c Added: trunk/reactos/lib/dsound/version.rc _____ Added: trunk/reactos/lib/dsound/buffer.c --- trunk/reactos/lib/dsound/buffer.c 2005-10-08 16:26:04 UTC (rev 18338) +++ trunk/reactos/lib/dsound/buffer.c 2005-10-08 16:38:07 UTC (rev 18339) @@ -0,0 +1,1562 @@ +/* DirectSound + * + * Copyright 1998 Marcus Meissner + * Copyright 1998 Rob Riggs + * Copyright 2000-2002 TransGaming Technologies, Inc. + * + * 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 + */ + +#include "config.h" +#include <assert.h> +#include <stdarg.h> +#include <stdio.h> +#include <sys/types.h> +#include <sys/fcntl.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif +#include <stdlib.h> +#include <string.h> +#include <math.h> + +#define NONAMELESSSTRUCT +#define NONAMELESSUNION +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winerror.h" +#include "mmsystem.h" +#include "winreg.h" +#include "winternl.h" +#include "mmddk.h" +#include "wine/windef16.h" +#include "wine/debug.h" +#include "dsound.h" +#include "dsdriver.h" +#include "dsound_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dsound); + +/********************************************************************** ********* + * IDirectSoundNotify + */ +static HRESULT WINAPI IDirectSoundNotifyImpl_QueryInterface( + LPDIRECTSOUNDNOTIFY iface,REFIID riid,LPVOID *ppobj +) { + IDirectSoundNotifyImpl *This = (IDirectSoundNotifyImpl *)iface; + TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); + + if (This->dsb == NULL) { + WARN("invalid parameter\n"); + return E_INVALIDARG; + } + + return IDirectSoundBuffer_QueryInterface((LPDIRECTSOUNDBUFFER)This->dsb, riid, ppobj); +} + +static ULONG WINAPI IDirectSoundNotifyImpl_AddRef(LPDIRECTSOUNDNOTIFY iface) +{ + IDirectSoundNotifyImpl *This = (IDirectSoundNotifyImpl *)iface; + TRACE("(%p) ref was %ld, thread is %04lx\n",This, This->ref, GetCurrentThreadId()); + return InterlockedIncrement(&(This->ref)); +} + +static ULONG WINAPI IDirectSoundNotifyImpl_Release(LPDIRECTSOUNDNOTIFY iface) { + IDirectSoundNotifyImpl *This = (IDirectSoundNotifyImpl *)iface; + ULONG ref; + + TRACE("(%p) ref was %ld, thread is %04lx\n",This, This->ref, GetCurrentThreadId()); + + ref = InterlockedDecrement(&(This->ref)); + if (ref == 0) { + IDirectSoundBuffer_Release((LPDIRECTSOUNDBUFFER)This->dsb); + This->dsb->notify = NULL; + HeapFree(GetProcessHeap(),0,This); + TRACE("(%p) released\n",This); + } + return ref; +} + +static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions( + LPDIRECTSOUNDNOTIFY iface,DWORD howmuch,LPCDSBPOSITIONNOTIFY notify +) { + IDirectSoundNotifyImpl *This = (IDirectSoundNotifyImpl *)iface; + TRACE("(%p,0x%08lx,%p)\n",This,howmuch,notify); + + if (howmuch > 0 && notify == NULL) { + WARN("invalid parameter: notify == NULL\n"); + return DSERR_INVALIDPARAM; + } + + if (TRACE_ON(dsound)) { + unsigned int i; + for (i=0;i<howmuch;i++) + TRACE("notify at %ld to 0x%08lx\n", + notify[i].dwOffset,(DWORD)notify[i].hEventNotify); + } + + if (This->dsb->hwnotify) { + HRESULT hres; + hres = IDsDriverNotify_SetNotificationPositions(This->dsb->hwnotify, howmuch, notify); + if (hres != DS_OK) + WARN("IDsDriverNotify_SetNotificationPositions failed\n"); + return hres; + } else if (howmuch > 0) { + /* Make an internal copy of the caller-supplied array. + * Replace the existing copy if one is already present. */ + if (This->dsb->notifies) + This->dsb->notifies = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + This->dsb->notifies, howmuch * sizeof(DSBPOSITIONNOTIFY)); + else + This->dsb->notifies = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + howmuch * sizeof(DSBPOSITIONNOTIFY)); + + if (This->dsb->notifies == NULL) { + WARN("out of memory\n"); + return DSERR_OUTOFMEMORY; + } + memcpy(This->dsb->notifies, notify, howmuch * sizeof(DSBPOSITIONNOTIFY)); + This->dsb->nrofnotifies = howmuch; + } else { + if (This->dsb->notifies) { + HeapFree(GetProcessHeap(), 0, This->dsb->notifies); + This->dsb->notifies = NULL; + } + This->dsb->nrofnotifies = 0; + } + + return S_OK; +} + +IDirectSoundNotifyVtbl dsnvt = +{ + IDirectSoundNotifyImpl_QueryInterface, + IDirectSoundNotifyImpl_AddRef, + IDirectSoundNotifyImpl_Release, + IDirectSoundNotifyImpl_SetNotificationPositions, +}; + +HRESULT WINAPI IDirectSoundNotifyImpl_Create( + IDirectSoundBufferImpl * dsb, + IDirectSoundNotifyImpl **pdsn) +{ + IDirectSoundNotifyImpl * dsn; + TRACE("(%p,%p)\n",dsb,pdsn); + + dsn = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(dsn)); + + if (dsn == NULL) { + WARN("out of memory\n"); + return DSERR_OUTOFMEMORY; + } + + dsn->ref = 0; + dsn->lpVtbl = &dsnvt; + dsn->dsb = dsb; + dsb->notify = dsn; + IDirectSoundBuffer_AddRef((LPDIRECTSOUNDBUFFER)dsb); + + *pdsn = dsn; + return DS_OK; +} + +HRESULT WINAPI IDirectSoundNotifyImpl_Destroy( + IDirectSoundNotifyImpl *pdsn) +{ + TRACE("(%p)\n",pdsn); + + while (IDirectSoundNotifyImpl_Release((LPDIRECTSOUNDNOTIFY)pdsn) > 0); + + return DS_OK; +} + +/********************************************************************** ********* + * IDirectSoundBuffer + */ + +static HRESULT WINAPI IDirectSoundBufferImpl_SetFormat( + LPDIRECTSOUNDBUFFER8 iface,LPCWAVEFORMATEX wfex +) { + IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; + + TRACE("(%p,%p)\n",This,wfex); + /* This method is not available on secondary buffers */ + WARN("invalid call\n"); + return DSERR_INVALIDCALL; +} + +static HRESULT WINAPI IDirectSoundBufferImpl_SetVolume( + LPDIRECTSOUNDBUFFER8 iface,LONG vol +) { + IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; + LONG oldVol; + HRESULT hres = DS_OK; + + TRACE("(%p,%ld)\n",This,vol); + + if (!(This->dsbd.dwFlags & DSBCAPS_CTRLVOLUME)) { + WARN("control unavailable: This->dsbd.dwFlags = 0x%08lx\n", This->dsbd.dwFlags); + return DSERR_CONTROLUNAVAIL; + } + + if ((vol > DSBVOLUME_MAX) || (vol < DSBVOLUME_MIN)) { + WARN("invalid parameter: vol = %ld\n", vol); + return DSERR_INVALIDPARAM; + } + + /* **** */ + EnterCriticalSection(&(This->lock)); + + if (This->dsbd.dwFlags & DSBCAPS_CTRL3D) { + oldVol = This->ds3db_lVolume; + This->ds3db_lVolume = vol; + } else { + oldVol = This->volpan.lVolume; + This->volpan.lVolume = vol; + if (vol != oldVol) + DSOUND_RecalcVolPan(&(This->volpan)); + } + + if (vol != oldVol) { + if (This->hwbuf) { + hres = IDsDriverBuffer_SetVolumePan(This->hwbuf, &(This->volpan)); + if (hres != DS_OK) + WARN("IDsDriverBuffer_SetVolumePan failed\n"); + } else + DSOUND_ForceRemix(This); + } + + LeaveCriticalSection(&(This->lock)); + /* **** */ + + return hres; +} + +static HRESULT WINAPI IDirectSoundBufferImpl_GetVolume( + LPDIRECTSOUNDBUFFER8 iface,LPLONG vol +) { + IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; + TRACE("(%p,%p)\n",This,vol); + + if (!(This->dsbd.dwFlags & DSBCAPS_CTRLVOLUME)) { + WARN("control unavailable\n"); + return DSERR_CONTROLUNAVAIL; + } + + if (vol == NULL) { + WARN("invalid parameter: vol == NULL\n"); + return DSERR_INVALIDPARAM; + } + + *vol = This->volpan.lVolume; + + return DS_OK; +} + +static HRESULT WINAPI IDirectSoundBufferImpl_SetFrequency( + LPDIRECTSOUNDBUFFER8 iface,DWORD freq +) { + IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; + DWORD oldFreq; + + TRACE("(%p,%ld)\n",This,freq); + + if (!(This->dsbd.dwFlags & DSBCAPS_CTRLFREQUENCY)) { + WARN("control unavailable\n"); + return DSERR_CONTROLUNAVAIL; + } + + if (freq == DSBFREQUENCY_ORIGINAL) + freq = This->pwfx->nSamplesPerSec; + + if ((freq < DSBFREQUENCY_MIN) || (freq > DSBFREQUENCY_MAX)) { + WARN("invalid parameter: freq = %ld\n", freq); + return DSERR_INVALIDPARAM; + } + + /* **** */ + EnterCriticalSection(&(This->lock)); + + oldFreq = This->freq; + This->freq = freq; + if (freq != oldFreq) { + This->freqAdjust = (freq << DSOUND_FREQSHIFT) / This->dsound->pwfx->nSamplesPerSec; + This->nAvgBytesPerSec = freq * This->pwfx->nBlockAlign; + DSOUND_RecalcFormat(This); + if (!This->hwbuf) + DSOUND_ForceRemix(This); + } + + LeaveCriticalSection(&(This->lock)); + /* **** */ + + return DS_OK; +} + +static HRESULT WINAPI IDirectSoundBufferImpl_Play( + LPDIRECTSOUNDBUFFER8 iface,DWORD reserved1,DWORD reserved2,DWORD flags +) { + HRESULT hres = DS_OK; + IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; + TRACE("(%p,%08lx,%08lx,%08lx)\n",This,reserved1,reserved2,flags); + + /* **** */ + EnterCriticalSection(&(This->lock)); + + This->playflags = flags; + if (This->state == STATE_STOPPED) { + This->leadin = TRUE; + This->startpos = This->buf_mixpos; + This->state = STATE_STARTING; + } else if (This->state == STATE_STOPPING) + This->state = STATE_PLAYING; + if (This->hwbuf) { + hres = IDsDriverBuffer_Play(This->hwbuf, 0, 0, This->playflags); + if (hres != DS_OK) + WARN("IDsDriverBuffer_Play failed\n"); + else + This->state = STATE_PLAYING; + } + + LeaveCriticalSection(&(This->lock)); + /* **** */ + + return hres; +} + +static HRESULT WINAPI IDirectSoundBufferImpl_Stop(LPDIRECTSOUNDBUFFER8 iface) +{ + HRESULT hres = DS_OK; + IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; + TRACE("(%p)\n",This); + + /* **** */ + EnterCriticalSection(&(This->lock)); + + if (This->state == STATE_PLAYING) + This->state = STATE_STOPPING; + else if (This->state == STATE_STARTING) + This->state = STATE_STOPPED; + if (This->hwbuf) { + hres = IDsDriverBuffer_Stop(This->hwbuf); + if (hres != DS_OK) + WARN("IDsDriverBuffer_Stop failed\n"); + else + This->state = STATE_STOPPED; + } + DSOUND_CheckEvent(This, 0); + + LeaveCriticalSection(&(This->lock)); + /* **** */ + + return hres; +} + +static ULONG WINAPI IDirectSoundBufferImpl_AddRef(LPDIRECTSOUNDBUFFER8 iface) +{ + IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; + TRACE("(%p) ref was %ld, thread is %04lx\n",This, This->ref, GetCurrentThreadId()); + return InterlockedIncrement(&(This->ref)); +} + +static ULONG WINAPI IDirectSoundBufferImpl_Release(LPDIRECTSOUNDBUFFER8 iface) +{ + IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; + ULONG ref; + + TRACE("(%p) ref was %ld, thread is %04lx\n",This, This->ref, GetCurrentThreadId()); + + ref = InterlockedDecrement(&(This->ref)); + if (ref) + return ref; + + DSOUND_RemoveBuffer(This->dsound, This); + + This->lock.DebugInfo->Spare[1] = 0; + DeleteCriticalSection(&(This->lock)); + + if (This->hwbuf) { + IDsDriverBuffer_Release(This->hwbuf); + if (This->dsound->drvdesc.dwFlags & DSDDESC_USESYSTEMMEMORY) { + This->buffer->ref--; + if (This->buffer->ref==0) { + HeapFree(GetProcessHeap(),0,This->buffer->memory); + HeapFree(GetProcessHeap(),0,This->buffer); + } + } + } else { + This->buffer->ref--; + if (This->buffer->ref==0) { + HeapFree(GetProcessHeap(),0,This->buffer->memory); + HeapFree(GetProcessHeap(),0,This->buffer); + } + } + + if (This->notifies != NULL) + HeapFree(GetProcessHeap(), 0, This->notifies); + + if (This->pwfx) + HeapFree(GetProcessHeap(), 0, This->pwfx); + + HeapFree(GetProcessHeap(),0,This); + + TRACE("(%p) released\n",This); + return 0; +} + +DWORD DSOUND_CalcPlayPosition(IDirectSoundBufferImpl *This, + DWORD state, DWORD pplay, DWORD pwrite, DWORD pmix, DWORD bmix) +{ + DWORD bplay; + + TRACE("primary playpos=%ld, mixpos=%ld\n", pplay, pmix); + TRACE("this mixpos=%ld, time=%ld\n", bmix, GetTickCount()); + + /* the actual primary play position (pplay) is always behind last mixed (pmix), + * unless the computer is too slow or something */ + /* we need to know how far away we are from there */ +#if 0 /* we'll never fill the primary entirely */ + if (pmix == pplay) { + if ((state == STATE_PLAYING) || (state == STATE_STOPPING)) { + /* wow, the software mixer is really doing well, + * seems the entire primary buffer is filled! */ + pmix += This->dsound->buflen; + } + /* else: the primary buffer is not playing, so probably empty */ + } +#endif + if (pmix < pplay) pmix += This->dsound->buflen; /* wraparound */ + pmix -= pplay; + /* detect buffer underrun */ + if (pwrite < pplay) pwrite += This->dsound->buflen; /* wraparound */ + pwrite -= pplay; + if (pmix > (ds_snd_queue_max * This->dsound->fraglen + pwrite + This->dsound->writelead)) { + WARN("detected an underrun: primary queue was %ld\n",pmix); + pmix = 0; + } + /* divide the offset by its sample size */ + pmix /= This->dsound->pwfx->nBlockAlign; + TRACE("primary back-samples=%ld\n",pmix); + /* adjust for our frequency */ + pmix = (pmix * This->freqAdjust) >> DSOUND_FREQSHIFT; + /* multiply by our own sample size */ + pmix *= This->pwfx->nBlockAlign; + TRACE("this back-offset=%ld\n", pmix); + /* subtract from our last mixed position */ + bplay = bmix; + while (bplay < pmix) bplay += This->buflen; /* wraparound */ + bplay -= pmix; + if (This->leadin && ((bplay < This->startpos) || (bplay > bmix))) { + /* seems we haven't started playing yet */ + TRACE("this still in lead-in phase\n"); + bplay = This->startpos; + } + /* return the result */ + return bplay; +} + +static HRESULT WINAPI IDirectSoundBufferImpl_GetCurrentPosition( + LPDIRECTSOUNDBUFFER8 iface,LPDWORD playpos,LPDWORD writepos +) { + HRESULT hres; + IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; + TRACE("(%p,%p,%p)\n",This,playpos,writepos); + if (This->hwbuf) { + hres=IDsDriverBuffer_GetPosition(This->hwbuf,playpos,writepos); + if (hres != DS_OK) { + WARN("IDsDriverBuffer_GetPosition failed\n"); + return hres; + } + } else { + if (playpos && (This->state != STATE_PLAYING)) { + /* we haven't been merged into the primary buffer (yet) */ + *playpos = This->buf_mixpos; + } else if (playpos) { + DWORD pplay, pwrite, lplay, splay, pstate; + /* let's get this exact; first, recursively call GetPosition on the primary */ + EnterCriticalSection(&(This->dsound->mixlock)); + if (DSOUND_PrimaryGetPosition(This->dsound, &pplay, &pwrite) != DS_OK) + WARN("DSOUND_PrimaryGetPosition failed\n"); + /* detect HEL mode underrun */ + pstate = This->dsound->state; + if (!(This->dsound->hwbuf || This->dsound->pwqueue)) { + TRACE("detected an underrun\n"); + /* pplay = ? */ + if (pstate == STATE_PLAYING) + pstate = STATE_STARTING; + else if (pstate == STATE_STOPPING) + pstate = STATE_STOPPED; + } + /* get data for ourselves while we still have the lock */ + pstate &= This->state; + lplay = This->primary_mixpos; + splay = This->buf_mixpos; + if ((This->dsbd.dwFlags & DSBCAPS_GETCURRENTPOSITION2) || This->dsound->hwbuf) { + /* calculate play position using this */ + *playpos = DSOUND_CalcPlayPosition(This, pstate, pplay, pwrite, lplay, splay); + } else { + /* (unless the app isn't using GETCURRENTPOSITION2) */ + /* don't know exactly how this should be handled... + * the docs says that play cursor is reported as directly + * behind write cursor, hmm... */ + /* let's just do what might work for Half-Life */ + DWORD wp; + wp = (This->dsound->pwplay + ds_hel_margin) * This->dsound->fraglen; + wp %= This->dsound->buflen; + *playpos = DSOUND_CalcPlayPosition(This, pstate, wp, pwrite, lplay, splay); + } + LeaveCriticalSection(&(This->dsound->mixlock)); + } + if (writepos) + *writepos = This->buf_mixpos; + } + if (writepos) { + if (This->state != STATE_STOPPED) { + /* apply the documented 10ms lead to writepos */ + *writepos += This->writelead; + } + *writepos %= This->buflen; + } + if (playpos) + This->last_playpos = *playpos; + TRACE("playpos = %ld, writepos = %ld (%p, time=%ld)\n", playpos?*playpos:0, writepos?*writepos:0, This, GetTickCount()); + return DS_OK; +} + +static HRESULT WINAPI IDirectSoundBufferImpl_GetStatus( + LPDIRECTSOUNDBUFFER8 iface,LPDWORD status +) { + IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; + TRACE("(%p,%p), thread is %04lx\n",This,status,GetCurrentThreadId()); + + if (status == NULL) { + WARN("invalid parameter: status = NULL\n"); + return DSERR_INVALIDPARAM; + } + + *status = 0; + if ((This->state == STATE_STARTING) || (This->state == STATE_PLAYING)) { + *status |= DSBSTATUS_PLAYING; + if (This->playflags & DSBPLAY_LOOPING) + *status |= DSBSTATUS_LOOPING; + } + + TRACE("status=%lx\n", *status); + return DS_OK; +} + + +static HRESULT WINAPI IDirectSoundBufferImpl_GetFormat( + LPDIRECTSOUNDBUFFER8 iface, + LPWAVEFORMATEX lpwf, + DWORD wfsize, + LPDWORD wfwritten) +{ + DWORD size; + IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; + TRACE("(%p,%p,%ld,%p)\n",This,lpwf,wfsize,wfwritten); + + size = sizeof(WAVEFORMATEX) + This->pwfx->cbSize; + + if (lpwf) { /* NULL is valid */ + if (wfsize >= size) { + memcpy(lpwf,This->pwfx,size); + if (wfwritten) + *wfwritten = size; + } else { + WARN("invalid parameter: wfsize to small\n"); + if (wfwritten) + *wfwritten = 0; + return DSERR_INVALIDPARAM; + } + } else { + if (wfwritten) + *wfwritten = sizeof(WAVEFORMATEX) + This->pwfx->cbSize; + else { + WARN("invalid parameter: wfwritten == NULL\n"); + return DSERR_INVALIDPARAM; + } + } + + return DS_OK; +} + +static HRESULT WINAPI IDirectSoundBufferImpl_Lock( + LPDIRECTSOUNDBUFFER8 iface,DWORD writecursor,DWORD writebytes,LPVOID lplpaudioptr1,LPDWORD audiobytes1,LPVOID lplpaudioptr2,LPDWORD audiobytes2,DWORD flags +) { + HRESULT hres = DS_OK; + IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; + + TRACE("(%p,%ld,%ld,%p,%p,%p,%p,0x%08lx) at %ld\n", + This, + writecursor, + writebytes, + lplpaudioptr1, + audiobytes1, + lplpaudioptr2, + audiobytes2, + flags, + GetTickCount() + ); + + if (flags & DSBLOCK_FROMWRITECURSOR) { + DWORD writepos; + /* GetCurrentPosition does too much magic to duplicate here */ + hres = IDirectSoundBufferImpl_GetCurrentPosition(iface, NULL, &writepos); + if (hres != DS_OK) { + WARN("IDirectSoundBufferImpl_GetCurrentPosition failed\n"); + return hres; + } + writecursor += writepos; + } + writecursor %= This->buflen; + if (flags & DSBLOCK_ENTIREBUFFER) + writebytes = This->buflen; + if (writebytes > This->buflen) + writebytes = This->buflen; + + EnterCriticalSection(&(This->lock)); + + if ((writebytes == This->buflen) && + ((This->state == STATE_STARTING) || + (This->state == STATE_PLAYING))) + /* some games, like Half-Life, try to be clever (not) and + * keep one secondary buffer, and mix sounds into it itself, + * locking the entire buffer every time... so we can just forget + * about tracking the last-written-to-position... */ + This->probably_valid_to = (DWORD)-1; + else + This->probably_valid_to = writecursor; + + if (!(This->dsound->drvdesc.dwFlags & DSDDESC_DONTNEEDSECONDARYLOCK) && This->hwbuf) { + hres = IDsDriverBuffer_Lock(This->hwbuf, + lplpaudioptr1, audiobytes1, + lplpaudioptr2, audiobytes2, + writecursor, writebytes, + 0); + if (hres != DS_OK) { + WARN("IDsDriverBuffer_Lock failed\n"); + LeaveCriticalSection(&(This->lock)); + return hres; + } + } else { + BOOL remix = FALSE; + if (writecursor+writebytes <= This->buflen) { + *(LPBYTE*)lplpaudioptr1 = This->buffer->memory+writecursor; + *audiobytes1 = writebytes; + if (lplpaudioptr2) + *(LPBYTE*)lplpaudioptr2 = NULL; + if (audiobytes2) + *audiobytes2 = 0; + TRACE("->%ld.0\n",writebytes); + } else { + *(LPBYTE*)lplpaudioptr1 = This->buffer->memory+writecursor; + *audiobytes1 = This->buflen-writecursor; + if (lplpaudioptr2) + *(LPBYTE*)lplpaudioptr2 = This->buffer->memory; + if (audiobytes2) + *audiobytes2 = writebytes-(This->buflen-writecursor); + TRACE("->%ld.%ld\n",*audiobytes1,audiobytes2?*audiobytes2:0); + } + if (This->state == STATE_PLAYING) { + /* if the segment between playpos and buf_mixpos is touched, + * we need to cancel some mixing */ + /* we'll assume that the app always calls GetCurrentPosition before + * locking a playing buffer, so that last_playpos is up-to-date */ + if (This->buf_mixpos >= This->last_playpos) { + if (This->buf_mixpos > writecursor && + This->last_playpos < writecursor+writebytes) + remix = TRUE; + } else { + if (This->buf_mixpos > writecursor || + This->last_playpos < writecursor+writebytes) + remix = TRUE; + } + if (remix) { + TRACE("locking prebuffered region, ouch\n"); + DSOUND_MixCancelAt(This, writecursor); + } + } + } + + LeaveCriticalSection(&(This->lock)); + return DS_OK; +} + +static HRESULT WINAPI IDirectSoundBufferImpl_SetCurrentPosition( + LPDIRECTSOUNDBUFFER8 iface,DWORD newpos +) { + HRESULT hres = DS_OK; + IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; + TRACE("(%p,%ld)\n",This,newpos); + + /* **** */ + EnterCriticalSection(&(This->lock)); + + newpos %= This->buflen; + This->buf_mixpos = newpos; + if (This->hwbuf) { + hres = IDsDriverBuffer_SetPosition(This->hwbuf, This->buf_mixpos); + if (hres != DS_OK) + WARN("IDsDriverBuffer_SetPosition failed\n"); + } + + LeaveCriticalSection(&(This->lock)); + /* **** */ + + return hres; +} + +static HRESULT WINAPI IDirectSoundBufferImpl_SetPan( + LPDIRECTSOUNDBUFFER8 iface,LONG pan +) { + HRESULT hres = DS_OK; + IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; + + TRACE("(%p,%ld)\n",This,pan); + + if ((pan > DSBPAN_RIGHT) || (pan < DSBPAN_LEFT)) { + WARN("invalid parameter: pan = %ld\n", pan); + return DSERR_INVALIDPARAM; + } + + /* You cannot use both pan and 3D controls */ + if (!(This->dsbd.dwFlags & DSBCAPS_CTRLPAN) || + (This->dsbd.dwFlags & DSBCAPS_CTRL3D)) { + WARN("control unavailable\n"); + return DSERR_CONTROLUNAVAIL; + } + + /* **** */ + EnterCriticalSection(&(This->lock)); + + if (This->volpan.lPan != pan) { + This->volpan.lPan = pan; + DSOUND_RecalcVolPan(&(This->volpan)); + + if (This->hwbuf) { + hres = IDsDriverBuffer_SetVolumePan(This->hwbuf, &(This->volpan)); + if (hres != DS_OK) + WARN("IDsDriverBuffer_SetVolumePan failed\n"); + } else + DSOUND_ForceRemix(This); + } + + LeaveCriticalSection(&(This->lock)); + /* **** */ + + return hres; +} + +static HRESULT WINAPI IDirectSoundBufferImpl_GetPan( + LPDIRECTSOUNDBUFFER8 iface,LPLONG pan +) { + IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; + TRACE("(%p,%p)\n",This,pan); + + if (!(This->dsbd.dwFlags & DSBCAPS_CTRLPAN)) { + WARN("control unavailable\n"); + return DSERR_CONTROLUNAVAIL; + } + + if (pan == NULL) { + WARN("invalid parameter: pan = NULL\n"); + return DSERR_INVALIDPARAM; + } + + *pan = This->volpan.lPan; + + return DS_OK; +} + +static HRESULT WINAPI IDirectSoundBufferImpl_Unlock( + LPDIRECTSOUNDBUFFER8 iface,LPVOID p1,DWORD x1,LPVOID p2,DWORD x2 +) { + IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; + DWORD probably_valid_to; + HRESULT hres = DS_OK; + + TRACE("(%p,%p,%ld,%p,%ld)\n", This,p1,x1,p2,x2); + + /* **** */ + EnterCriticalSection(&(This->lock)); + + if (!(This->dsound->drvdesc.dwFlags & DSDDESC_DONTNEEDSECONDARYLOCK) && This->hwbuf) { + hres = IDsDriverBuffer_Unlock(This->hwbuf, p1, x1, p2, x2); + if (hres != DS_OK) + WARN("IDsDriverBuffer_Unlock failed\n"); + } + + if (hres == DS_OK) { + if (p2) probably_valid_to = (((LPBYTE)p2)-This->buffer->memory) + x2; + else probably_valid_to = (((LPBYTE)p1)-This->buffer->memory) + x1; + probably_valid_to %= This->buflen; + if ((probably_valid_to == 0) && ((x1+x2) == This->buflen) && + ((This->state == STATE_STARTING) || + (This->state == STATE_PLAYING))) + /* see IDirectSoundBufferImpl_Lock */ + probably_valid_to = (DWORD)-1; + This->probably_valid_to = probably_valid_to; + } + + LeaveCriticalSection(&(This->lock)); + /* **** */ + + TRACE("probably_valid_to=%ld\n", This->probably_valid_to); + return hres; +} + +static HRESULT WINAPI IDirectSoundBufferImpl_Restore( + LPDIRECTSOUNDBUFFER8 iface +) { + IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; + FIXME("(%p):stub\n",This); + return DS_OK; +} + +static HRESULT WINAPI IDirectSoundBufferImpl_GetFrequency( + LPDIRECTSOUNDBUFFER8 iface,LPDWORD freq +) { + IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; + TRACE("(%p,%p)\n",This,freq); + + if (freq == NULL) { + WARN("invalid parameter: freq = NULL\n"); + return DSERR_INVALIDPARAM; + } + + *freq = This->freq; + TRACE("-> %ld\n", *freq); + + return DS_OK; +} + +static HRESULT WINAPI IDirectSoundBufferImpl_SetFX( + LPDIRECTSOUNDBUFFER8 iface,DWORD dwEffectsCount,LPDSEFFECTDESC pDSFXDesc,LPDWORD pdwResultCodes +) { + IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; + DWORD u; + + FIXME("(%p,%lu,%p,%p): stub\n",This,dwEffectsCount,pDSFXDesc,pdwResultCodes); + + if (pdwResultCodes) + for (u=0; u<dwEffectsCount; u++) pdwResultCodes[u] = DSFXR_UNKNOWN; + + WARN("control unavailable\n"); + return DSERR_CONTROLUNAVAIL; +} + +static HRESULT WINAPI IDirectSoundBufferImpl_AcquireResources( + LPDIRECTSOUNDBUFFER8 iface,DWORD dwFlags,DWORD dwEffectsCount,LPDWORD pdwResultCodes +) { + IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; + DWORD u; + + FIXME("(%p,%08lu,%lu,%p): stub\n",This,dwFlags,dwEffectsCount,pdwResultCodes); + + if (pdwResultCodes) + for (u=0; u<dwEffectsCount; u++) pdwResultCodes[u] = DSFXR_UNKNOWN; + + WARN("control unavailable\n"); + return DSERR_CONTROLUNAVAIL; +} + +static HRESULT WINAPI IDirectSoundBufferImpl_GetObjectInPath( + LPDIRECTSOUNDBUFFER8 iface,REFGUID rguidObject,DWORD dwIndex,REFGUID rguidInterface,LPVOID* ppObject +) { + IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; + + FIXME("(%p,%s,%lu,%s,%p): stub\n",This,debugstr_guid(rguidObject),dwIndex,debugstr_guid(rguidInter face),ppObject); + + WARN("control unavailable\n"); + return DSERR_CONTROLUNAVAIL; +} + +static HRESULT WINAPI IDirectSoundBufferImpl_Initialize( + LPDIRECTSOUNDBUFFER8 iface,LPDIRECTSOUND dsound,LPCDSBUFFERDESC dbsd +) { + IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; + FIXME("(%p,%p,%p):stub\n",This,dsound,dbsd); + DPRINTF("Re-Init!!!\n"); + WARN("already initialized\n"); + return DSERR_ALREADYINITIALIZED; +} + +static HRESULT WINAPI IDirectSoundBufferImpl_GetCaps( + LPDIRECTSOUNDBUFFER8 iface,LPDSBCAPS caps +) { + IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; + TRACE("(%p)->(%p)\n",This,caps); + + if (caps == NULL) { + WARN("invalid parameter: caps == NULL\n"); + return DSERR_INVALIDPARAM; + } + + if (caps->dwSize < sizeof(*caps)) { + WARN("invalid parameter: caps->dwSize = %ld < %d\n",caps->dwSize, sizeof(*caps)); + return DSERR_INVALIDPARAM; + } + + caps->dwFlags = This->dsbd.dwFlags; + if (This->hwbuf) caps->dwFlags |= DSBCAPS_LOCHARDWARE; + else caps->dwFlags |= DSBCAPS_LOCSOFTWARE; + + caps->dwBufferBytes = This->buflen; + + /* This value represents the speed of the "unlock" command. + As unlock is quite fast (it does not do anything), I put + 4096 ko/s = 4 Mo / s */ + /* FIXME: hwbuf speed */ + caps->dwUnlockTransferRate = 4096; + caps->dwPlayCpuOverhead = 0; + + return DS_OK; +} + +static HRESULT WINAPI IDirectSoundBufferImpl_QueryInterface( + LPDIRECTSOUNDBUFFER8 iface,REFIID riid,LPVOID *ppobj +) { + IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; + + TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); + + if (ppobj == NULL) { + WARN("invalid parameter\n"); + return E_INVALIDARG; + } + + *ppobj = NULL; /* assume failure */ + + if ( IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDirectSoundBuffer) || + IsEqualGUID(riid, &IID_IDirectSoundBuffer8) ) { + if (!This->dsb) + SecondaryBufferImpl_Create(This, &(This->dsb)); + if (This->dsb) { + IDirectSoundBuffer8_AddRef((LPDIRECTSOUNDBUFFER8)This->dsb); + *ppobj = This->dsb; + return S_OK; + } + WARN("IID_IDirectSoundBuffer\n"); + return E_NOINTERFACE; + } + + if ( IsEqualGUID( &IID_IDirectSoundNotify, riid ) ) { + if (!This->notify) + IDirectSoundNotifyImpl_Create(This, &(This->notify)); + if (This->notify) { + IDirectSoundNotify_AddRef((LPDIRECTSOUNDNOTIFY)This->notify); + *ppobj = This->notify; + return S_OK; + } + WARN("IID_IDirectSoundNotify\n"); + return E_NOINTERFACE; + } + + if ( IsEqualGUID( &IID_IDirectSound3DBuffer, riid ) ) { + if (!This->ds3db) + IDirectSound3DBufferImpl_Create(This, &(This->ds3db)); + if (This->ds3db) { + IDirectSound3DBuffer_AddRef((LPDIRECTSOUND3DBUFFER)This->ds3db); + *ppobj = This->ds3db; + return S_OK; + } + WARN("IID_IDirectSound3DBuffer\n"); + return E_NOINTERFACE; + } + + if ( IsEqualGUID( &IID_IDirectSound3DListener, riid ) ) { + ERR("app requested IDirectSound3DListener on secondary buffer\n"); + return E_NOINTERFACE; + } + + if ( IsEqualGUID( &IID_IKsPropertySet, riid ) ) { + if (!This->iks) + IKsBufferPropertySetImpl_Create(This, &(This->iks)); + if (This->iks) { + IKsPropertySet_AddRef((LPKSPROPERTYSET)This->iks); + *ppobj = This->iks; + return S_OK; + } [truncated at 1000 lines; 16475 more skipped]

19 years, 2 months

← Newer
1
...
55
56
57
58
59
60
61
...
74
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2005