Ros-diffs May 2009

ros-diffs@reactos.org

27 participants
504 discussions

[fireball] 41126: - Make memcpy a duplicate of a memmove (confirmed by testing), there is a dependency on this behaviour. One less "msvcrt_winetest.exe string" failure.
by fireball＠svn.reactos.org 26 May '09

26 May '09

Author: fireball Date: Tue May 26 20:35:01 2009 New Revision: 41126 URL: http://svn.reactos.org/svn/reactos?rev=41126&view=rev Log: - Make memcpy a duplicate of a memmove (confirmed by testing), there is a dependency on this behaviour. One less "msvcrt_winetest.exe string" failure. Removed: trunk/reactos/media/doc/memcpy_optimize.txt Modified: trunk/reactos/lib/sdk/crt/mem/i386/memcpy_asm.s trunk/reactos/lib/sdk/crt/mem/i386/memmove_asm.s trunk/reactos/lib/sdk/crt/mem/memcpy.c trunk/reactos/lib/sdk/crt/mem/memmove.c Modified: trunk/reactos/lib/sdk/crt/mem/i386/memcpy_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/i386/memcp… ============================================================================== --- trunk/reactos/lib/sdk/crt/mem/i386/memcpy_asm.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mem/i386/memcpy_asm.s [iso-8859-1] Tue May 26 20:35:01 2009 @@ -1,7 +1,7 @@ /* * void *memcpy (void *to, const void *from, size_t count) * - * Some optimization research can be found in media/doc/memcpy_optimize.txt + * NOTE: This code is a duplicate of memmove function from memmove_asm.s */ .globl _memcpy @@ -9,26 +9,39 @@ _memcpy: push %ebp mov %esp,%ebp + push %esi push %edi - mov 0x8(%ebp),%edi - mov 0xc(%ebp),%esi - mov 0x10(%ebp),%ecx + + mov 8(%ebp),%edi + mov 12(%ebp),%esi + mov 16(%ebp),%ecx + + cmp %esi,%edi + jbe .CopyUp + mov %ecx,%eax + add %esi,%eax + cmp %eax,%edi + jb .CopyDown + +.CopyUp: cld + cmp $16,%ecx jb .L1 mov %ecx,%edx test $3,%edi je .L2 /* - * Make the destination dword aligned + * Make the destination dword aligned */ - mov %edi,%ecx - neg %ecx - and $3,%ecx - sub %ecx,%edx - rep movsb - mov %edx,%ecx + mov %edi,%ecx + and $3,%ecx + sub $5,%ecx + not %ecx + sub %ecx,%edx + rep movsb + mov %edx,%ecx .L2: shr $2,%ecx rep movsl @@ -39,9 +52,63 @@ je .L3 rep movsb .L3: + mov 8(%ebp),%eax pop %edi pop %esi - mov 0x8(%ebp),%eax leave ret +.CopyDown: + std + + add %ecx,%edi + add %ecx,%esi + + cmp $16,%ecx + jb .L4 + mov %ecx,%edx + test $3,%edi + je .L5 + +/* + * Make the destination dword aligned + */ + mov %edi,%ecx + and $3,%ecx + sub %ecx,%edx + dec %esi + dec %edi + rep movsb + mov %edx,%ecx + + sub $3,%esi + sub $3,%edi +.L6: + shr $2,%ecx + rep movsl + mov %edx,%ecx + and $3,%ecx + je .L7 + add $3,%esi + add $3,%edi +.L8: + rep movsb +.L7: + cld + mov 8(%ebp),%eax + pop %edi + pop %esi + leave + ret +.L5: + sub $4,%edi + sub $4,%esi + jmp .L6 + +.L4: + test %ecx,%ecx + je .L7 + dec %esi + dec %edi + jmp .L8 + Modified: trunk/reactos/lib/sdk/crt/mem/i386/memmove_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/i386/memmo… ============================================================================== --- trunk/reactos/lib/sdk/crt/mem/i386/memmove_asm.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mem/i386/memmove_asm.s [iso-8859-1] Tue May 26 20:35:01 2009 @@ -1,9 +1,7 @@ -/* - * $Id$ - */ - /* * void *memmove (void *to, const void *from, size_t count) + * + * NOTE: This code is duplicated in memcpy_asm.s */ .globl _memmove Modified: trunk/reactos/lib/sdk/crt/mem/memcpy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/memcpy.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/mem/memcpy.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mem/memcpy.c [iso-8859-1] Tue May 26 20:35:01 2009 @@ -1,16 +1,36 @@ -/* - * $Id$ - */ - #include <string.h> +/* NOTE: This code is a duplicate of memmove implementation! */ void* memcpy(void* to, const void* from, size_t count) { - register char *f = (char *)from; - register char *t = (char *)to; - register int i = count; + char *char_dest = (char *)dest; + char *char_src = (char *)src; - while (i-- > 0) - *t++ = *f++; - return to; + if ((char_dest <= char_src) || (char_dest >= (char_src+count))) + { + /* non-overlapping buffers */ + while(count > 0) + { + *char_dest = *char_src; + char_dest++; + char_src++; + count--; + } + } + else + { + /* overlaping buffers */ + char_dest = (char *)dest + count - 1; + char_src = (char *)src + count - 1; + + while(count > 0) + { + *char_dest = *char_src; + char_dest--; + char_src--; + count--; + } + } + + return dest; } Modified: trunk/reactos/lib/sdk/crt/mem/memmove.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/memmove.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/mem/memmove.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mem/memmove.c [iso-8859-1] Tue May 26 20:35:01 2009 @@ -1,10 +1,6 @@ -/* - * $Id$ - */ - #include <string.h> - +/* NOTE: This code is duplicated in memcpy function */ void * memmove(void *dest,const void *src,size_t count) { char *char_dest = (char *)dest; Removed: trunk/reactos/media/doc/memcpy_optimize.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/memcpy_optimize.… ============================================================================== --- trunk/reactos/media/doc/memcpy_optimize.txt [iso-8859-1] (original) +++ trunk/reactos/media/doc/memcpy_optimize.txt (removed) @@ -1,55 +1,0 @@ -Surfing the Internet, I stumbled upon http://www.sciencemark.org where you -can download a benchmark program that (amongst others) can benchmark different -x86 memcpy implementations. Running that benchmark on my machine revealed that -the fastest implementation was roughly twice as fast as the "rep movsl" -implementation (lib/string/i386/memcpy_asm.s) that ReactOS uses. -To test the alternate implementations in a ReactOS setting, I first -instrumented the existing memcpy implementation to log with which arguments -it was being called. I then booted ReactOS, started a background compile in it -(to generate some I/O) and played a game of Solitaire (to generate graphics -operations). After loosing the game, I shut down ReactOS. I then extracted -the memcpy calls roughly between the start of Explorer (to get rid of one time -startup effects) an shutdown. The resulting call profile is attached below. -I then used that profile to make calls to the existing memcpy and an alternate -implementation (I selected the "MMX registry copy with SSE prefetching"), -taking care to use different source and destination regions to remove caching -effects. The profile consisted of roughly 250000 calls to memcpy, I found -that I had to execute the profile 10000 times to get "reasonable" time values. -To compensate for the overhead of the test program, I also ran a test where -the whole memcpy routine consisted of a single instruction: "ret". The test -results, after applying a correction for the overhead: - -rep movl 70.5 sec -mmx registers 58.3 sec -Speed increase: 17% - -(Test machine: AMD Athlon MP 2800+ running Linux). -Although the relative speed increase is nice (17%), we also have to look at the -absolute speed increase. Remember that the 70.5 sec for the "rep movl" case -was obtained by running the whole profile 10000 times. This means that all the -memcpy's executed during the profiling run of ReactOS together took only -0.00705 seconds. So the conclusion has to be that we're simply not spending -a significant amount of time in memcpy (BTW, our memcpy implementation is -shared between kernel and user mode, of the total of 250000 memcpy calls about -90% were made from kernel mode and 10% from user mode), so optimizing memcpy -(although possible) will not result in a significant better performance of -ReactOS as a whole. -Just for fun, I then used only the part of the profile where the memory area -was larger than 128 bytes. The MMX implementation actually only runs for sizes -over 128 bytes, for smaller sizes it deferred to the "rep movl" implementation. -According to the profile, the vast majority of memcpy calls is made with a -size smaller than 128 bytes (96.8%). - -rep movl 52.9 sec -mmx registers 27.1 sec -Speed increase 48% - -This is more or less in line with the results I got from the membench benchmark -from http://www.sciencemark.org. - -Final conclusion: Although optimizing memcpy is useful (and feasible) for -transfer of large blocks, the usage pattern in ReactOS consists mostly of -small blocks. The resulting absolute spead increase doesn't justify the -increased code complexity. - -2005/12/03 GvG

1 0

[cwittich] 41125: sync LISTBOX_DeleteItem and LISTBOX_RemoveItem with wine 1.1.22
by cwittich＠svn.reactos.org 26 May '09

26 May '09

Author: cwittich Date: Tue May 26 19:57:17 2009 New Revision: 41125 URL: http://svn.reactos.org/svn/reactos?rev=41125&view=rev Log: sync LISTBOX_DeleteItem and LISTBOX_RemoveItem with wine 1.1.22 Modified: trunk/reactos/dll/win32/user32/controls/listbox.c Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] Tue May 26 19:57:17 2009 @@ -1714,12 +1714,19 @@ */ static void LISTBOX_DeleteItem( LB_DESCR *descr, INT index ) { + /* save the item data before it gets freed by LB_RESETCONTENT */ + ULONG_PTR item_data = descr->items[index].data; + LPWSTR item_str = descr->items[index].str; + + if (!descr->nb_items) + SendMessageW( descr->self, LB_RESETCONTENT, 0, 0 ); + /* Note: Win 3.1 only sends DELETEITEM on owner-draw items, * while Win95 sends it for all items with user data. * It's probably better to send it too often than not * often enough, so this is what we do here. */ - if (IS_OWNERDRAW(descr) || descr->items[index].data) + if (IS_OWNERDRAW(descr) || item_data) { DELETEITEMSTRUCT dis; UINT id = (UINT)GetWindowLongPtrW( descr->self, GWLP_ID ); @@ -1728,11 +1735,11 @@ dis.CtlID = id; dis.itemID = index; dis.hwndItem = descr->self; - dis.itemData = descr->items[index].data; + dis.itemData = item_data; SendMessageW( descr->owner, WM_DELETEITEM, id, (LPARAM)&dis ); } if (HAS_STRINGS(descr)) - HeapFree( GetProcessHeap(), 0, descr->items[index].str ); + HeapFree( GetProcessHeap(), 0, item_str ); } @@ -1751,15 +1758,17 @@ /* We need to invalidate the original rect instead of the updated one. */ LISTBOX_InvalidateItems( descr, index ); + descr->nb_items--; LISTBOX_DeleteItem( descr, index ); + if (!descr->nb_items) return LB_OKAY; + /* Remove the item */ item = &descr->items[index]; - if (index < descr->nb_items-1) + if (index < descr->nb_items) RtlMoveMemory( item, item + 1, - (descr->nb_items - index - 1) * sizeof(LB_ITEMDATA) ); - descr->nb_items--; + (descr->nb_items - index) * sizeof(LB_ITEMDATA) ); if (descr->anchor_item == descr->nb_items) descr->anchor_item--; /* Shrink the item array if possible */

1 0

[dreimer] 41124: Bug 4535: Dutch translation for userinit by wouterdevlieger@gmail.com Bug 4539: slovak translation update by Mario Kacmar Bug 4540: Romanian translation patch by Petru Dimitriu
by dreimer＠svn.reactos.org 26 May '09

26 May '09

Author: dreimer Date: Tue May 26 16:10:58 2009 New Revision: 41124 URL: http://svn.reactos.org/svn/reactos?rev=41124&view=rev Log: Bug 4535: Dutch translation for userinit by wouterdevlieger(a)gmail.com Bug 4539: slovak translation update by Mario Kacmar Bug 4540: Romanian translation patch by Petru Dimitriu Added: trunk/reactos/base/system/userinit/lang/nl-NL.rc (with props) trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc (with props) trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc (with props) trunk/reactos/dll/win32/msgina/lang/ro-RO.rc (with props) trunk/reactos/dll/win32/newdev/lang/ro-RO.rc (with props) trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc (with props) Modified: trunk/reactos/base/applications/mscutils/servman/lang/sk-SK.rc trunk/reactos/base/applications/winhlp32/macro.c trunk/reactos/base/system/userinit/rsrc.rc trunk/reactos/dll/cpl/sysdm/rsrc.rc trunk/reactos/dll/win32/devmgr/devmgr.rc trunk/reactos/dll/win32/msgina/msgina.rc trunk/reactos/dll/win32/newdev/rsrc.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc trunk/reactos/dll/win32/syssetup/syssetup.rc Modified: trunk/reactos/base/applications/mscutils/servman/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/sk-SK.rc [iso-8859-1] Tue May 26 16:10:58 2009 @@ -1,6 +1,6 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: 18-09-2008 - * LAST CHANGE: 05-11-2008 + * LAST CHANGE: 02-05-2009 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -152,6 +152,19 @@ DEFPUSHBUTTON "Nie", IDCANCEL, 102, 129, 54, 13 END +IDD_DLG_DEPEND_STOP DIALOGEX 6,6,240,148 +CAPTION "Stop Other Services" +FONT 8, "MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME +BEGIN + ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 + LTEXT "", IDC_STOP_DEPENDS, 40, 8, 170, 25 + LISTBOX IDC_STOP_DEPENDS_LB, 15, 40, 210, 70, WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE | LBS_NOSEL + LTEXT "Naozaj chcete zastavi tieto sluby?",IDC_STATIC, 15, 110, 150, 10 + DEFPUSHBUTTON "Áno", IDOK, 60, 129, 54, 14 + PUSHBUTTON "Nie", IDCANCEL, 120, 129, 54, 14 +END + IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 CAPTION "Monosti" FONT 8, "MS Shell Dlg",0,0 @@ -196,6 +209,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_NUM_SERVICES "Poèet sluieb: %d" + IDS_STOP_DEPENDS "When %s stops, these other services will also stop" IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." END @@ -257,11 +271,11 @@ IDS_HINT_HELP " Display help window." IDS_HINT_ABOUT " Èo je Manaér sluieb systému ReactOS." - IDS_HINT_SYS_RESTORE " Restores this window to normal size." + IDS_HINT_SYS_RESTORE " Obnoví ve¾kos tohto okna na normálnu." IDS_HINT_SYS_MOVE " Presunie toto okno." - IDS_HINT_SYS_SIZE " Resizes this window." - IDS_HINT_SYS_MINIMIZE " Collapses this window to an icon." - IDS_HINT_SYS_MAXIMIZE " Expands this window to fill this screen." + IDS_HINT_SYS_SIZE " Zmení ve¾kos tohto okna." + IDS_HINT_SYS_MINIMIZE " Zbalí toto okno do ikony." + IDS_HINT_SYS_MAXIMIZE " Zväèí ve¾kos tohto okna tak, aby vyplnilo obrazovku." IDS_HINT_SYS_CLOSE " Zavrie toto okno." END Modified: trunk/reactos/base/applications/winhlp32/macro.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] Tue May 26 16:10:58 2009 @@ -47,6 +47,14 @@ /******* helper functions *******/ +static char* StrDup(const char* str) +{ + char* dst; + dst=HeapAlloc(GetProcessHeap(),0,strlen(str)+1); + strcpy(dst, str); + return dst; +} + static WINHELP_BUTTON** MACRO_LookupButton(WINHELP_WINDOW* win, LPCSTR name) { WINHELP_BUTTON** b; @@ -711,7 +719,7 @@ else if ((dll = HeapAlloc(GetProcessHeap(), 0, sizeof(*dll)))) { dll->hLib = hLib; - dll->name = strdup(dll_name); /* FIXME */ + dll->name = StrDup(dll_name); /* FIXME: never freed */ dll->next = Globals.dlls; Globals.dlls = dll; dll->handler = (WINHELP_LDLLHandler)GetProcAddress(dll->hLib, "LDLLHandler"); @@ -731,10 +739,10 @@ size = ++MACRO_NumLoaded * sizeof(struct MacroDesc); if (!MACRO_Loaded) MACRO_Loaded = HeapAlloc(GetProcessHeap(), 0, size); else MACRO_Loaded = HeapReAlloc(GetProcessHeap(), 0, MACRO_Loaded, size); - MACRO_Loaded[MACRO_NumLoaded - 1].name = strdup(proc); /* FIXME */ + MACRO_Loaded[MACRO_NumLoaded - 1].name = StrDup(proc); /* FIXME: never freed */ MACRO_Loaded[MACRO_NumLoaded - 1].alias = NULL; MACRO_Loaded[MACRO_NumLoaded - 1].isBool = 0; - MACRO_Loaded[MACRO_NumLoaded - 1].arguments = strdup(args); /* FIXME */ + MACRO_Loaded[MACRO_NumLoaded - 1].arguments = StrDup(args); /* FIXME: never freed */ MACRO_Loaded[MACRO_NumLoaded - 1].fn = fn; WINE_TRACE("Added %s(%s) at %p\n", proc, args, fn); } Added: trunk/reactos/base/system/userinit/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/nl-NL.rc (added) +++ trunk/reactos/base/system/userinit/lang/nl-NL.rc [iso-8859-1] Tue May 26 16:10:58 2009 @@ -1,0 +1,13 @@ +#include "resource.h" +/* + * Dutch Language resource file + * Translated by: Wouter De Vlieger + */ + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +BEGIN + +STRING_USERINIT_FAIL, "Userinit kon de shell niet starten!\n" + +END Propchange: trunk/reactos/base/system/userinit/lang/nl-NL.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/userinit/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/rsrc.… ============================================================================== --- trunk/reactos/base/system/userinit/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/rsrc.rc [iso-8859-1] Tue May 26 16:10:58 2009 @@ -16,6 +16,7 @@ #include "lang/it-IT.rc" #include "lang/ja-JP.rc" #include "lang/lt-LT.rc" +#include "lang/nl-NL.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" Added: trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ro-RO.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc (added) +++ trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] Tue May 26 16:10:58 2009 @@ -1,0 +1,275 @@ +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 256, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Generalitãþi" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "Sistem:", IDC_STATIC, 4, 132, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 + LTEXT "Versiune ", IDC_STATIC, 10, 153, 25, 9 + LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9 + LTEXT "Computer:", IDC_STATIC, 124, 132, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + CONTROL "Vedeþi <A HREF=""http://www.reactos.org/"">pagina de web ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 140, 8 + PUSHBUTTON "&Licenþã...", IDC_LICENCE, 170, 199, 78, 13 +END + + +IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, 256, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Hardware" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Gestionarul de dispozitive", IDC_STATIC, 6, 7, 244, 61 + ICON IDI_DEVMGR, IDC_STATIC, 12, 18, 23, 21, SS_ICON + LTEXT "Gestionarul de dispozitive afiºeazã toate dispozitivele instalate. Folosiþi-l pentru a schimba proprietãþile oricãrui dispozitiv.", IDC_STATIC, 42, 18, 204, 24 + PUSHBUTTON "&Gestionar dispozitive", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 15 + + GROUPBOX "Expert hardware", IDC_STATIC, 6, 79, 244, 61 + ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + LTEXT "Expertul hardware vã permite sã instalaþi, dezinstalaþi, reparaþi sau deconectaþi dispozitivele dvs.", IDC_STATIC, 42, 90, 204, 24 + PUSHBUTTON "&Expert hardware", IDC_HARDWARE_WIZARD, 154, 120, 90, 15 + + GROUPBOX "Profile hardware", IDC_STATIC, 6, 149, 244, 61 + ICON IDI_HARDPROF, IDC_STATIC, 12, 160, 23, 21, SS_ICON + LTEXT "Profilele hardware vã permit sã stabiliþi ºi sã stocaþi setãrile de hardware.", IDC_STATIC, 42, 160, 204, 24 + PUSHBUTTON "&Profile hardware", IDC_HARDWARE_PROFILE, 154, 190, 90, 15 +END + + +IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Avansat" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Privilegii de administrator sunt necesare pentru majoriteatea setãrilor de aici.", IDC_STATIC, 12, 5, 236, 8 + GROUPBOX "Performanþã", IDC_STATIC, 6, 18, 244, 50 + LTEXT "Opþiunile de performanþã afecteazã cum folosesc aplicaþiile memoria ºi astfel viteza computerului.", IDC_STATIC, 16, 29, 228, 17 + PUSHBUTTON "Seãri", IDC_PERFOR, 194, 48, 50, 15 + + GROUPBOX "Profile utilizator", IDC_STATIC, 6,75,244,48 + LTEXT "Setãri legate de contul dumneavoastrã", IDC_STATIC, 16, 88, 228, 20 + PUSHBUTTON "Setãri", IDC_USERPROFILE, 194, 103, 50, 15 + + GROUPBOX "Pornire ºi Recuperare", IDC_STATIC, 6, 131, 244, 52 + LTEXT "Aceste setãri regleazã modul cum porneºte ReactOS dar ºi ce sã facã ReactOS când întâlneºte o eroare gravã.", IDC_STATIC, 16, 144, 228, 19 + PUSHBUTTON "Setãri", IDC_STAREC, 194, 162, 50, 15 + + PUSHBUTTON "Variabile de mediu", IDC_ENVVAR, 84, 192, 80, 15 + PUSHBUTTON "Raportarea erorilor", IDC_ERRORREPORT, 170, 192, 80, 15 +END + + +IDD_HARDWAREPROFILES DIALOGEX 6, 18, 254, 234 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Profile de hardware" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 8, 11, 18, 20, SS_ICON + LTEXT "Puteþi stabili profile de hardware pentru diverse configurãri de hardware. La pornire puteþi alege ce profil vreþi sã folosiþi.", IDC_STATIC, 46, 11, 188, 25 + LTEXT "Profile disponibile:", IDC_STATIC, 8, 41, 120, 8 + LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON + PUSHBUTTON "&Proprietãþi", IDC_HRDPROFPROP, 8, 106, 50, 14 + PUSHBUTTON "&Copiere", IDC_HRDPROFCOPY, 63, 106, 50, 14 + PUSHBUTTON "&Redenumire", IDC_HRDPROFRENAME, 118, 106, 50, 14 + PUSHBUTTON "&Eliminare", IDC_HRDPROFDEL, 173, 106, 50, 14 + + GROUPBOX "Selecþie profile de hardware", IDC_STATIC, 7, 130, 240, 75 + LTEXT "Când ReactOS porneºte:", IDC_STATIC, 14, 142, 210, 8 + AUTORADIOBUTTON "Se &aºteaptã pânã când aleg eu profilul", IDC_HRDPROFWAIT, 14, 158, 133, 8, WS_GROUP + AUTORADIOBUTTON "&Se alege primul profil dacã eu nu selectez niciunul", IDC_HRDPROFSELECT, 14, 173, 190, 8 + LTEXT "secunde", IDC_STATIC, 65, 187, 35, 8 + EDITTEXT IDC_HRDPROFEDIT, 25, 185, 35, 12 + CONTROL "", IDC_HRDPROFUPDWN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 + + DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 + PUSHBUTTON "Anulare", IDCANCEL, 197, 213, 50, 14 +END + + +IDD_RENAMEPROFILE DIALOGEX 12, 26, 256, 52 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Redenumire profil" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "De la:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "", IDC_RENPROFEDITFROM, 30, 10, 160, 10 + LTEXT "La:", IDC_STATIC, 5, 30, 20, 8 + EDITTEXT IDC_RENPROFEDITTO, 30, 30, 160, 12 + + DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14 + PUSHBUTTON "Anulare", IDCANCEL, 199, 30, 50, 14 +END + + +IDD_USERPROFILE DIALOGEX 0, 0, 256, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Profile utilizator" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_USERPROF, IDC_STATIC, 6, 11, 16, 16, SS_ICON + LTEXT "Profilele conþin setãri personale legate de interfaþã dar ºi alte setãri legate de contul dvs. Poate fi creat câte un profil pentru fiecare computer pe care îl folosiþi sau puteþi avea un profil cãlãtor, universal.", + IDC_STATIC, 40, 11, 211, 35 + LTEXT "Profile stocate pe acest computer:", IDC_STATIC, 16, 51, 204, 9 + CONTROL "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, + 6, 66, 244, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "Schimbare tip", IDC_USERPROFILE_CHANGE, 90, 156, 50, 13 + PUSHBUTTON "Eliminare", IDC_USERPROFILE_DELETE, 145, 156, 50, 13 + PUSHBUTTON "Copiere în", IDC_USERPROFILE_COPY, 200, 156, 50, 13 + + CONTROL "Pentru a crea conturi de utilizator noi, vedeþi <A>Conturi de utilizator</A> în Panoul de control.", IDC_USERACCOUNT_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 175, 245, 18 + + DEFPUSHBUTTON "OK", IDOK, 134, 200, 54, 13 + PUSHBUTTON "Anulare", IDCANCEL, 196, 200, 54, 13 +END + + +IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Pornire ºi Recuperare" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Pornire sistem", IDC_STATIC, 7, 12, 238, 95 + LTEXT "Sistem de operare implicit:", IDC_STATIC, 14, 26, 100, 8 + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + AUTOCHECKBOX "&Cât timp se afiºeazã lista cu sistemele de operare:", IDC_STRECLIST, 14, 56, 160, 8 + EDITTEXT IDC_STRRECLISTEDIT, 185, 54, 30, 12, ES_NUMBER + CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 + LTEXT "sec.", IDC_STATIC, 223, 56, 18, 8 + AUTOCHECKBOX "Cât timp se afiºeazã &opþiunile de recuperare când sunt necesare:", IDC_STRRECREC, 14, 70, 170, 8 + EDITTEXT IDC_STRRECRECEDIT, 185, 68, 30, 12, ES_NUMBER + CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 + LTEXT "sec.", IDC_STATIC, 223, 70, 18, 8 + LTEXT "Pentru a edita opþiunile de pornire manual, apãsaþi Editare.", IDC_STATIC, 14, 89, 187, 8 + PUSHBUTTON "&Editare", IDC_STRRECEDIT, 188, 87, 50, 14 + + GROUPBOX "Erori grave", IDC_STATIC, 7, 111, 238, 140 + AUTOCHECKBOX "&Consemnare eveniment în jurnalul de sistem", IDC_STRRECWRITEEVENT, 14, 124, 148, 10 + AUTOCHECKBOX "T&rimitere alertã administrativã", IDC_STRRECSENDALERT, 14, 138, 148, 10 + AUTOCHECKBOX "Repornire &automatã", IDC_STRRECRESTART, 14, 152, 145, 10 + + GROUPBOX "Scriere informaþii depanare", IDC_STATIC, 12, 167, 227, 76 + COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST + LTEXT "&Fiºier:", IDC_STATIC, 17, 202, 150, 8 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + AUTOCHECKBOX "&Suprascriere fiºier", IDC_STRRECOVERWRITE, 17, 228, 125, 10 + + DEFPUSHBUTTON "OK", IDOK, 141, 259, 50, 14 + PUSHBUTTON "Anulare", IDCANCEL, 195, 259, 50, 14 +END + + +IDD_VIRTMEM DIALOGEX 6, 6, 223, 248 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Memorie virtualã" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Partiþie [Etichetã]", IDC_STATIC, 12, 5, 96, 9 + LTEXT "Mãrime fiº. paginare (MO)", IDC_STATIC, 115, 5, 96, 9 + LISTBOX IDC_PAGEFILELIST, 10, 16, 204, 52, LBS_NOTIFY | LBS_USETABSTOPS + GROUPBOX "Mãrime fiºier paginare pt. partiþia selectatã", IDC_DRIVEGROUP, 10, 70, 204, 104 + LTEXT "Partiþie:", IDC_STATIC, 20, 80, 20, 8 + LTEXT "", IDC_DRIVE, 88, 81, 100, 9 + LTEXT "Spaþiu disponibil:", IDC_STATIC, 20, 92, 56, 9 + LTEXT "", IDC_SPACEAVAIL, 88, 92, 104, 9 + LTEXT "&Mãrime iniþialã (MO):", -1, 22, 118, 75, 9 + LTEXT "Mã&rime maximã (MO):", -1, 22, 131, 75, 9 + AUTORADIOBUTTON "&Mãrime particularizatã", IDC_CUSTOM, 20, 105, 54, 9, WS_GROUP + AUTORADIOBUTTON "Mãrime gestionatã de sistem", IDC_SYSMANSIZE, 20, 145, 88, 9 + AUTORADIOBUTTON "&Fãrã fiºier paginare", IDC_NOPAGEFILE, 20, 158, 78,9 + EDITTEXT IDC_INITIALSIZE, 100, 114, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE + EDITTEXT IDC_MAXSIZE, 100, 129, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE + PUSHBUTTON "Setare", IDC_SET, 158, 155, 50, 13 + + GROUPBOX "Fiºier paginare total", IDC_TOTALGROUP, 10, 177, 204, 46 + LTEXT "Minim permis:", IDC_STATIC, 18, 188, 58, 9 + LTEXT "", IDC_MINIMUM, 88, 188, 100, 9 + LTEXT "Recomandat:", IDC_STATIC, 18, 199, 52, 9 + LTEXT "", IDC_RECOMMENDED, 88, 199, 100, 9 + LTEXT "Alocat acum:", IDC_STATIC, 18, 210, 66, 9 + LTEXT "", IDC_CURRENT, 88, 210, 100, 9 + + DEFPUSHBUTTON "OK", IDOK, 114, 232, 48, 13 + PUSHBUTTON "Anulare", IDCANCEL, 168, 232, 48, 13 +END + + +IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Variabile de mediu" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Variable utilizator", IDC_STATIC, 7, 12, 238, 100 + + CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", + LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | + WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE + PUSHBUTTON "&Nou...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 + PUSHBUTTON "&Editare...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 + PUSHBUTTON "&ªtergere", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 + GROUPBOX "Variabile de sistem", IDC_STATIC, 7, 116, 238, 100 + + CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", + LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | + WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE + PUSHBUTTON "No&u...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 + PUSHBUTTON "Ed&itare...", IDC_SYSTEM_VARIABLE_EDIT, 134, 194, 50, 14 + PUSHBUTTON "ªte&rgere", IDC_SYSTEM_VARIABLE_DELETE, 188, 194, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 141, 224, 50, 14, WS_GROUP + PUSHBUTTON "Anulare", IDCANCEL, 195, 224, 50, 14 +END + + +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Edit Variable" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Nume &variabilã:", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL + LTEXT "Valoare &variabilã:", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 116, 50, 50, 14 + PUSHBUTTON "Anulare", IDCANCEL, 170, 50, 50, 14 +END + + +IDD_LICENCE DIALOGEX 6, 5, 267, 159 +CAPTION "Licenþã" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +BEGIN + EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE + DEFPUSHBUTTON "OK", IDOK, 106, 142, 54, 13 +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPLSYSTEMNAME "Sistem" + IDS_CPLSYSTEMDESCRIPTION "Afiºeazã informaþii despre sistem ºi schimbã anumite setãri de sistem sau hardware." + IDS_MEGABYTE "MO de RAM" + IDS_GIGABYTE "GO de RAM" + IDS_TERABYTE "TO de RAM" + IDS_PETABYTE "PO de RAM" + IDS_VARIABLE "Variabilã" + IDS_VALUE "Valoare" + IDS_NO_DUMP "(nimic)" + IDS_MINI_DUMP "Minidump(64KO)" + IDS_KERNEL_DUMP "Kernel dump" + IDS_FULL_DUMP "Dump complet" + IDS_USERPROFILE_NAME "Nume" + IDS_USERPROFILE_SIZE "Mãrime" + IDS_USERPROFILE_TYPE "Tip" + IDS_USERPROFILE_STATUS "Stare" + IDS_USERPROFILE_MODIFIED "Modificat" +END Propchange: trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/sysdm/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/rsrc.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/rsrc.rc [iso-8859-1] Tue May 26 16:10:58 2009 @@ -13,6 +13,7 @@ #include "lang/ja-JP.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/sv-SE.rc" Modified: trunk/reactos/dll/win32/devmgr/devmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgr.rc… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgr.rc [iso-8859-1] Tue May 26 16:10:58 2009 @@ -25,6 +25,7 @@ #include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc (added) +++ trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc [iso-8859-1] Tue May 26 16:10:58 2009 @@ -1,0 +1,171 @@ +// Romanian language resource file (Petru Dimitriu, 2009-24-05) + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_NAME "Nume" + IDS_TYPE "Tip" + IDS_MANUFACTURER "Producãtor: %1" + IDS_LOCATION "Locaþie: %1" + IDS_STATUS "Stare dispozitiv: %1" + IDS_UNKNOWN "Necunoscut" + IDS_LOCATIONSTR "Locaþie %1!u! (%2)" + IDS_DEVCODE " (Cod %1!u!)" + IDS_DEVCODE2 " (Cod %2!u!)" + IDS_ENABLEDEVICE "Folosire dispozitiv (activare)" + IDS_DISABLEDEVICE "Nu folosi dispozitivul (dezactivare)" + IDS_UNKNOWNDEVICE "Dispozitiv necunoscut" + IDS_NODRIVERLOADED "Nu existã drivere instalate pentru acest dispozitiv." + IDS_DEVONPARENT "pe %1" + IDS_TROUBLESHOOTDEV "&Depanare..." + IDS_ENABLEDEV "A&ctivare" + IDS_REINSTALLDRV "Re&instalare driver" + IDS_PROPERTIES "P&roprietãþi" + IDS_UPDATEDRV "A&ctualizare driver..." + IDS_REBOOT "Repornire &computer..." + IDS_NOTAVAILABLE "Indisponibil" + IDS_NOTDIGITALLYSIGNED "Nesemnat digital" + IDS_NODRIVERS "Nu sunt necesare fiºiere driver pentru acest dispozitiv sau nu a fost încãrcat niciunul." +END + +/* error messages, source: http://www.z123.org/techsupport/medm.htm */ +STRINGTABLE +BEGIN + IDS_DEV_NO_PROBLEM "Acest dispozitiv funcþioneazã bine." + IDS_DEV_NOT_CONFIGURED "Acest dispozitiv nu e configurat corect." + IDS_DEV_DEVLOADER_FAILED "ReactOS nu a putut încãrca driverul deoarece computerul indicã douã tipuri de magistrale $1." + IDS_DEV_DEVLOADER_FAILED2 "Încãrcãtorul sau încãrcãtoarele pentru dispozitivul $1 nu au putut încãrca driverul." + IDS_DEV_OUT_OF_MEMORY "Este posibil ca driverul sã fie stricat sau sistemul dumneavoastrã ruleazã pe puþinã memorie." + IDS_DEV_ENTRY_IS_WRONG_TYPE "Acest dispozitiv nu funcþioneazã bine deoarece cel puþin unul din driverele lui este stricat sau este avariat sistemul de registri." + IDS_DEV_LACKED_ARBITRATOR "Driverul acestui dispozitiv solicitã un tip de resurse cu care ReactOS nu ºtie sã lucreze." + IDS_DEV_BOOT_CONFIG_CONFLICT "Alt dispozitiv foloseºte deja resursele acestui dispozitiv." + IDS_DEV_FAILED_FILTER "Driverele pentru acest dispozitiv trebuiesc reinstalate." + IDS_DEV_DEVLOADER_NOT_FOUND "Acest dispozitiv nu funcþioneazã bine deoarece ReactOS nu poate deschide fiºierul $1 care încarcã driverul." + IDS_DEV_DEVLOADER_NOT_FOUND2 "Acest dispozitiv nu funcþioneazã bine deoare fiºierul $1 care încarcã driverul este stricat." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Defecþiune dispozitiv: Încercaþi sã schimbaþi driverul. Dacã asta nu rezolvã problema, vedeþi documentaþia driverului." + IDS_DEV_INVALID_DATA "Acest dispozitiv nu funcþioneazã bine deoarece sistemul BIOS al computerului raporteazã resursele dispozitivului greºit." + IDS_DEV_INVALID_DATA2 "Acest dispozitiv nu funcþioneazã bine deoarece sistemul BIOS al dispozitivului raporteazã resursele dispozitivului greºit. " + IDS_DEV_FAILED_START "Acest dispozitiv fie nu e prezent, fie nu funcþioneazã bine, fie nu are toate driverele instalate." + IDS_DEV_LIAR "ReactOS s-a blocat când a încercat sã porneascã dispozitivul ºi astfel nu va mai încerca sã îl porneascã din nou." + IDS_DEV_NORMAL_CONFLICT "Acest dispozitiv nu are la dispoziþie $1 resurse pentru folosiinþã." + IDS_DEV_NOT_VERIFIED "Acest dispozitiv fie nu e prezent, fie nu funcþioneazã bine, fie nu are toate driverele instalate." + IDS_DEV_NEED_RESTART "Acest dispozitiv nu poate funcþiona ." + IDS_DEV_REENUMERATION "Acest dispoztiv produce un conflict de resurse." + IDS_DEV_PARTIAL_LOG_CONF "ReactOS nu a putut identifica toate resursele pe care acest dispozitiv le foloseºte." + IDS_DEV_UNKNOWN_RESOURCE "Fiºierul de informaþii $1 spune acestui sub-dispozitiv sã foloseascã o resursã pe care dispozitivul-pãrinte nu o are sau nu o recunoaºte." + IDS_DEV_REINSTALL "Driverele pentru acest dispozitiv trebuiesc reinstalate." + IDS_DEV_REGISTRY "Se pare cã registrii sunt avariaþi." + IDS_DEV_WILL_BE_REMOVED "ReactOS eliminã în acest moment dispozitivul." + IDS_DEV_DISABLED "Acest dispozitiv nu e pornit încã." + IDS_DEV_DISABLED2 "Acest dispozitiv este dezactivat." + IDS_DEV_DEVLOADER_NOT_READY "Încãrcãtoarele pentru acest dispozitiv nu pot încãrca driverele necesare." + IDS_DEV_DEVLOADER_NOT_READY2 "Acest adaptor pentru monitor funcþioneazã bine." + IDS_DEV_DEVLOADER_NOT_READY3 "Încãrcãtoarele pentru acest dispozitiv nu pot încãrca driverele necesare." + IDS_DEV_DEVICE_NOT_THERE "Acest dispozitiv fie nu e prezent, fie nu funcþioneazã bine, fie nu are toate driverele instalate." + IDS_DEV_MOVED "ReactOS instaleazã în acest moment acest dispozitiv." + IDS_DEV_TOO_EARLY "ReactOS instaleazã în acest moment acest dispozitiv." + IDS_DEV_NO_VALID_LOG_CONF "ReactOS nu poate specifica resoursele pentru acest dispozitiv." + IDS_DEV_FAILED_INSTALL "Driverele pentru acest dispozitiv nu sunt instalate." + IDS_DEV_HARDWARE_DISABLED "Acest dispozitiv este dezactivat deoarece sistemul BIOS al acestuia nu îi rezervã nicio resursã." + IDS_DEV_CANT_SHARE_IRQ "Acest dispozitiv foloseºte o resursã Interrupt Request - Cerere de Întrerupere (IRQ) care este folositã deja de alt dispozitiv ºi nu poate fi folositã în comun.\nTrebuie sã schimbaþi setãrile care intrã în conflict sau sã eliminaþi driverul în mod real care produce conflictul." + IDS_DEV_FAILED_ADD "Acest dispozitiv nu funcþioneazã bine deoarcere $1 nu funcþioneazã corect." + IDS_DEV_DISABLED_SERVICE "ReactOS nu poate instala driverele pentru acest dispozitiv deoarece nu poate accesa locaþia unde sunt stocate fiºierele de instalare." + IDS_DEV_TRANSLATION_FAILED "Acest dispozitiv nu rãspunde la comenzile driverului." + IDS_DEV_NO_SOFTCONFIG "ReactOS nu poate determina setãrile acestui dispozitiv. Consultaþi documentaþia care a venit cu acesta ºi folosiþi fila Resurse pentru a seta configuraþia." + IDS_DEV_BIOS_TABLE "Computerul dumneavoastrã nu conþine componentele (fizice sau virtuale) necesare pentru a configura ºi a lucra cu acest dispozitiv. \nPentru a folosi acest dispozitiv, contactaþi producãtorul computerului pentru o actualizare a sistemului BIOS ºi a firmware-ului." + IDS_DEV_IRQ_TRANSLATION_FAILED "Acest dispozitiv a solicitat o întrerupere PCI pe când el este configurat pentru întreruperi ISA (sau viceversa). \nVã rugãm folosiþi programul de configurare sistem pentru a configura întreruperile." + IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS nu poate iniþializa driverul pentru acest dispozitiv." + IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS nu poate încãrca driverul pentru acest dispozitiv deoarece acesta este deja încãrcat în memorie." + IDS_DEV_DRIVER_FAILED_LOAD "ReactOS nu poate încãrca driverul pentru acest dispozitiv. Este posibil ca acesta sã fie stricat sau sã lipseascã." + IDS_DEV_DRIVER_SERVICE_KEY_INVALID "ReactOS nu poate accesa dispozitivul deoarece cheile din registri pentru acest dispozitiv deoarece acestea lipsesc sau nu sunt corect înregistrate." + IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS a încãrcat cu succes driverul pentru acest dispozitiv dar nu gãseºte dispozitivul." + IDS_DEV_DUPLICATE_DEVICE "ReactOS nu poate încãrca driverul deoarece existã un dispozitiv dublurã care deja funcþioneazã." + IDS_DEV_FAILED_POST_START "ReactOS a oprit dispozitivul deoarece acesta a indicat probleme." + IDS_DEV_HALTED "O aplicaþie sau un serviciu a oprit acest dispozitiv." + IDS_DEV_PHANTOM "Acest dispozitiv nu este conectat la computer." + IDS_DEV_SYSTEM_SHUTDOWN "ReactOS nu poate accesa dispozitivul deoarece sistemul de operare este în curs de închidere." + IDS_DEV_HELD_FOR_EJECT "ReactOS nu poate folosi acest dispozitiv deoarece acesta a fost pregãtit pentru eliminarea în siguranþã dar încã nu a fost deconectat." + IDS_DEV_DRIVER_BLOCKED "Software-ul acestui dispozitiv a fost oprit deoarece se cunoaºte cã acesta întâmpinã probleme pe ReactOS. Contactaþi vânzãtorul driverului pentru unul nou." + IDS_DEV_REGISTRY_TOO_LARGE "ReactOS nu poate porni acest dispozitiv deoarece hive-ul de sistem este prea mare." + IDS_DEV_SETPROPERTIES_FAILED "ReactOS nu a putut schimba setãrile acestui dispozitiv." +END + +IDD_HARDWARE DIALOGEX DISCARDABLE 0, 0, 300, 400 +STYLE DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Dispozitive:",IDC_DEVICES,7,6,196,10 + CONTROL "",IDC_LV_DEVICES,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,16,196,50 + GROUPBOX "Proprietãþi dispozitiv",IDC_PROPERTIESGROUP,7,76,196,105 + LTEXT "",IDC_MANUFACTURER,14,88,183,10,SS_ENDELLIPSIS + LTEXT "",IDC_LOCATION,14,100,183,10,SS_ENDELLIPSIS + LTEXT "",IDC_STATUS,14,112,183,30 + PUSHBUTTON "&Depanare...",IDC_TROUBLESHOOT,85,140,54,14, + BS_PUSHBUTTON | WS_CHILD | WS_DISABLED | WS_TABSTOP + PUSHBUTTON "P&roprietãþi",IDC_PROPERTIES,146,140,50,14 +END + +IDD_DEVICEGENERAL DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Tip dispozitiv:", -1, 37, 39, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DEVTYPE, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Producãtor:", -1, 37, 53, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DEVMANUFACTURER, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Locaþie:", -1, 37, 67, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DEVLOCATION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + GROUPBOX "Stare dispozitiv", IDC_DEVSTATUSGROUP, 7, 83, 238, 100 + EDITTEXT IDC_DEVSTATUS, 14, 96, 224, 61, NOT WS_TABSTOP | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL + PUSHBUTTON "&Depanare", IDC_DEVPROBLEM, 148, 163, 90, 15 + LTEXT "&Folosire dispozitiv:", IDC_DEVUSAGELABEL, 7, 188, 222, 8, WS_DISABLED + COMBOBOX IDC_DEVUSAGE, 7, 198, 239, 40, CBS_DROPDOWNLIST | WS_VSCROLL | WS_DISABLED +END + +IDD_DEVICEDRIVER DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Driver" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Furnizor driver:", -1, 37, 39, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DRVPROVIDER, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Datã driver:", -1, 37, 53, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DRVDATE, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Versiune driver:", -1, 37, 67, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Semnatar digital:", -1, 37, 81, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + PUSHBUTTON "&Detalii...", IDC_DRIVERDETAILS, 7, 106, 70, 15 + LTEXT "Pentru a vedea detalii despre fiºierele driver.", -1, 91, 110, 154, 17, SS_NOPREFIX +END + +IDD_DRIVERDETAILS DIALOGEX DISCARDABLE 0, 0, 224, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Detalii fiºiere driver" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "&Fiºiere driver:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERFILES, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LTEXT "Furnizor:", -1, 14, 134, 50, 8 + LTEXT "", IDC_FILEPROVIDER, 66, 134, 155, 8 + LTEXT "Versiune fiºier:", -1, 14, 150, 50, 8 + LTEXT "", IDC_FILEVERSION, 66, 150, 155, 8 + LTEXT "Drept de autor:", -1, 14, 166, 50, 8 + LTEXT "", IDC_FILECOPYRIGHT, 66, 166, 155, 8 + LTEXT "Semnatar digital:", -1, 14, 182, 50, 8 + LTEXT "", IDC_DIGITALSIGNER, 66, 182, 155, 8 + PUSHBUTTON "OK", IDOK, 167, 228, 50, 14 +END + Propchange: trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ro-RO.rc (added) +++ trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] Tue May 26 16:10:58 2009 @@ -1,0 +1,57 @@ +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Vã rugãm aºteptaþi..." +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + +IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Bun venit la ReactOS" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 5, 32, 32 + LTEXT "Apãsaþi combinaþia de taste Ctrl-Alt-Del",IDC_STATIC, 38, 10, 144, 14 +END + +IDD_LOGGEDOUT_DLG DIALOGEX 0,0,275,147 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Autentificare" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + PUSHBUTTON "OK",IDOK,51,122,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Anulare",IDCANCEL,115,122,50,14 + PUSHBUTTON "Închidere",IDC_SHUTDOWN,179,122,50,14 + LTEXT "Nume utilizator:",IDC_STATIC,36,75,40,8 + LTEXT "Parolã:",IDC_STATIC,36,93,42,8 + EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL + EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 +END + +IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU +CAPTION "Securitate" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + PUSHBUTTON "Anulare",IDCANCEL,170,95,70,14 + PUSHBUTTON "Deautentificare",IDC_LOGOFF,90,76,70,14 + PUSHBUTTON "Închidere",IDC_SHUTDOWN,170,76,70,14 + LTEXT "Ce vreþi sã faceþi?",IDC_STATIC,86,60,87,8 + PUSHBUTTON "Blocare computer",IDC_LOCK,10,76,70,14 + PUSHBUTTON "Gestionar activitãþi",IDC_TASKMGR,90,95,70,14 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 +END + +STRINGTABLE +BEGIN + IDS_LOGGEDOUTSAS "Bun venit!" + IDS_LOCKEDSAS "Computerul este acum blocat." + IDS_PRESSCTRLALTDELETE "Apãsaþi Control+Alt+Delete pentru a vã autentifica." + IDS_ASKFORUSER "Nume utilizator: " + IDS_ASKFORPASSWORD "Parolã: " + IDS_FORCELOGOFF "Aceastã acþiune va deautentifica utilizatorul curent ºi va pierde datele nesalvat. Sigur continuaþi?" +END Propchange: trunk/reactos/dll/win32/msgina/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msgina/msgina.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rc… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.rc [iso-8859-1] Tue May 26 16:10:58 2009 @@ -19,6 +19,7 @@ #include "lang/it-IT.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/dll/win32/newdev/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/ro-RO.rc (added) +++ trunk/reactos/dll/win32/newdev/lang/ro-RO.rc [iso-8859-1] Tue May 26 16:10:58 2009 @@ -1,0 +1,109 @@ +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Instalare dispozitiv" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Bun venit",IDC_WELCOMETITLE,120,8,195,24 + LTEXT "Acest expert instaleazã un driver pentru dispozitivul:", + IDC_STATIC,120,21,195,16 + LTEXT "Clic pe Urmãtor pentru a continua.",IDC_STATIC,120,169,195,17 + LTEXT "DISPOZITIV NECUNOSCUT",IDC_DEVICE,134,36,164,11 + LTEXT "AVERTISMENT! INSTALAREA UNUI DISPOZITIV NECUNOSCUT POATE AVEA EFECTE GRAVE ASUPRA COMPUTERULUI DVS!",IDC_STATIC,120,59,195,16 + CONTROL "Instalare automatã",IDC_RADIO_AUTO,"Button", + BS_AUTORADIOBUTTON,120,112,178,13 + CONTROL "Instalare driver din locaþie specificã",IDC_RADIO_MANUAL, + "Button",BS_AUTORADIOBUTTON,120,133,164,14 +END + +IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Instalare dispozitiv" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Instalarea a eºuat",IDC_FINISHTITLE,120,8,195,24 + LTEXT "Dispozitivul nu a fost instalat pentru cã driverul nu a fost gãsit.", + IDC_STATIC,120,40,195,19 + LTEXT "Clic pe Înapoi dacã aveþi un disc sau ºtiþi calea driverului.", + IDC_STATIC,120,98,181,24 + CONTROL "Nu mai afiºa acest dialog",IDC_DONOTSHOWDLG,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 +END + +IDD_INSTALLFAILED DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Instalare dispozitiv" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Instalarea a eºuat",IDC_FINISHTITLE,120,8,195,24 + LTEXT "Dispozitivul nu s-a instalat deoarece a fost întâmpinatã o eroare neaºteptatã.", + IDC_STATIC,120,40,195,19 + LTEXT "DISPOZITIV NECUNOSCUT",IDC_DEVICE,134,55,164,11 +END + +IDD_CHSOURCE DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalare dispozitiv" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Cãutare în aceste locaþii",IDC_RADIO_SEARCHHERE,"Button", + BS_AUTORADIOBUTTON,27,11,239,13 + CONTROL "Alegere driver manual",IDC_RADIO_CHOOSE,"Button", + BS_AUTORADIOBUTTON,27,98,171,12 + CONTROL "Cãutare pe amovabile",IDC_CHECK_MEDIA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,47,33,163,9 + CONTROL "Includere cale",IDC_CHECK_PATH,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,47,54,162,10 + PUSHBUTTON "Rãsfoire",IDC_BROWSE,248,69,50,14 + COMBOBOX IDC_COMBO_PATH,61,71,176,12,CBS_DROPDOWN | CBS_SORT | + WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL +END + +IDD_SEARCHDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalare dispozitiv" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "DISPOZITIV NECUNOSCUT",IDC_DEVICE,51,20,169,16 +END + +IDD_INSTALLDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalare dispozitiv" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "DISPOZITIV NECUNOSCUT",IDC_DEVICE,51,20,169,16 +END + +IDD_NEEDREBOOT DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Instalare dispozitiv" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Instalare completã",IDC_FINISHTITLE,120,8,195,11 + LTEXT "Trebuie sã reporniþi pentru a finaliza instalarea:", + IDC_STATIC,120,32,195,19 + LTEXT "Clic pe Terminã pentru a închide expertul.",IDC_STATIC,120,174, + 179,11 + LTEXT "DISPOZITIV NECUNOSCUT",IDC_DEVICE,148,53,147,12 +END + +IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Instalare dispozitiv" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Instalare completã",IDC_FINISHTITLE,120,8,195,11 + LTEXT "Expertul a terminat instalarea dispozitivului:", + IDC_STATIC,120,32,195,19 + LTEXT "Clic pe Terminã pentru a închide expertul.",IDC_STATIC,120,174, + 179,11 + LTEXT "DISPOZITIV NECUNOSCUT",IDC_DEVICE,148,53,147,12 +END + Propchange: trunk/reactos/dll/win32/newdev/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/newdev/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/win32/newdev/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/rsrc.rc [iso-8859-1] Tue May 26 16:10:58 2009 @@ -18,6 +18,7 @@ #include "lang/it-IT.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/th-TH.rc" Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Tue May 26 16:10:58 2009 @@ -695,7 +695,7 @@ IDS_COMMON_PICTURES "Documente\\Fotografiile mele" IDS_COMMON_VIDEO "Documente\\Filmele mele" IDS_CDBURN_AREA "Setãri locale\\Date Aplicaþii\\Microsoft\\CD Burning" - IDS_NETWORKPLACE "Locaºiile mele în reºea" + IDS_NETWORKPLACE "Locaþiile mele în reþea" IDS_NEWFOLDER "Dosar nou" Added: trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ro… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc (added) +++ trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc [iso-8859-1] Tue May 26 16:10:58 2009 @@ -1,0 +1,303 @@ +/* + * Copyright (C) 2004 Filip Navara + * Copyright (C) 2004 Eric Kohl + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + + +IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalare ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Bun venit la Expertul de instalare a ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24 + LTEXT "Acest expert instaleazã ReactOS pe computerul dvs. Expertul "\ + "trebuie sã adune niºte informaþii despre computer"\ + "pentru a instala ReactOS corect.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Clic pe Urmãtor pentru a continua.", IDC_STATIC, 115, 169, 195, 17 +END + + +IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalare ReactOS" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Dezvoltatorii ReactOS le sunt recunoscãtori urmãtoarelor proiecte de software liber "\ + "din care s-au utilizat pãrþi de cod la crearea ReactOS:", + IDC_STATIC,15,7,286,19 + LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | + LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LTEXT "ReactOS este sub licenþa GPL, astfel dacã vreþi sã îl redistribuiþi "\ + "trebuie sã respectaþi licenþa GPL.", + IDC_STATIC,15,110,227,19 + PUSHBUTTON "&Vizualizare GPL...",IDC_VIEWGPL,251,110,50,19 + LTEXT "Clic pe Urmãtor pentru a continua.",IDC_STATIC,15,136, + 195,17 +END + + +IDD_OWNERPAGE DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalare ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 + LTEXT "Scrieþi-vã numele ºi numele companiei sau organizaþiei din care faceþi parte.", + IDC_STATIC, 54, 7, 242, 21 + LTEXT "Nu&me:", IDC_STATIC, 54, 37, 44, 8 + EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Organizaþie:", IDC_STATIC, 54, 57, 44, 8 + EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL +END + + +IDD_COMPUTERPAGE DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalare ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 + LTEXT "Scrieþi un nume pentru computer de maxim 63 de caractere. "\ + "Dacã sunteþi în reþea, numele computerului trebuie sã fie unic.", + IDC_STATIC, 54, 7, 250, 24 + LTEXT "&Nume:", IDC_STATIC, 54, 38, 75, 8 + EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 + LTEXT "Expertul va crea un cont de utilizator cu numele Administrator. "\ + "Îl puteþi folosi când vreþi control complet asupra computerului.", + IDC_STATIC, 54, 57, 250, 25 + LTEXT "Scrieþi o parolã pentru Administrator de maxim 14 caractere.", + IDC_STATIC, 54, 87, 250, 8 + LTEXT "&Parolã administrator:", IDC_STATIC, 54, 104, 105, 8 + EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + LTEXT "C&onfirmare parolã:", IDC_STATIC, 54, 123, 105, 8 + EDITTEXT IDC_ADMINPASSWORD2, 165, 120, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD +END + + +IDD_LOCALEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalare ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 + LTEXT "Setãrile regionale ar trebui sã se potriveascã cu limba"\ + "programelor. Acestea controleazã cum apar numerele, "\ + "datele ºi valutele.", IDC_STATIC, 53, 7, 253, 20 + LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 + LTEXT "Pentru a aceste setãri, clic pe Particularizare.", + IDC_STATIC, 53, 60, 196, 8 + PUSHBUTTON "&Particularizare", IDC_CUSTOMLOCALE, 250, 57, 50, 14 + LTEXT "Controalele de ºablon tastaturã seteazã cum apar literele când scrieþi.", + IDC_STATIC, 53, 86, 253, 8 + LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 + LTEXT "Pentru a schimba ºablonul, clic pe Particularizare.", + IDC_STATIC, 53, 126, 184, 8 + PUSHBUTTON "Particularizare", IDC_CUSTOMLAYOUT, 250, 122, 50, 14 +END + + +IDD_DATETIMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalare ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Datã ºi timp:", IDC_STATIC, 53, 7, 253, 8 + CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", + DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 + CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 + LTEXT "Fus orar:", IDC_STATIC, 53, 42, 253, 8 + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, + CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + AUTOCHECKBOX "Ajustare automatã ceas la schimbarea de fus orar", + IDC_AUTODAYLIGHT, 53, 124, 201, 10 +END + + +IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalare ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 + LTEXT "", IDC_ITEM, 53, 29, 253, 20 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", + PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 +END + + +IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Finalizare instalare ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Terminare Expert instalare ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 + LTEXT "Aþi terminat cu succes instalarea ReactOS.\n\n" \ + "Dupã ce veþi apãsa Terminã computerul va reporni.", IDC_STATIC, 115, 40, 195, 100 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 + LTEXT "Dacã aveþi un CD introdus în computer, scoateþi-l. Pentru a "\ + "reporni computerul, clic pe Terminã.", IDC_STATIC, 115, 169, 195, 17 +END + + +IDD_GPL DIALOGEX 0, 0, 333, 230 +STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Licenþa publicã generalã GNU" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_GPL_TEXT,7,7,319,190,ES_MULTILINE | ES_AUTOHSCROLL | + ES_READONLY | WS_VSCROLL + DEFPUSHBUTTON "OK",IDOK,141,209,50,14 +END + + +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Vã rugãm aºteptaþi..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + +STRINGTABLE +BEGIN + IDS_ACKTITLE "Aducere-aminte" + IDS_ACKSUBTITLE "Cine a contribuit la ReactOS ºi informaþii despre licenþã" + IDS_OWNERTITLE "Personalizaþi" + IDS_OWNERSUBTITLE "Expertul foloseºte informaþii despre dvs pentru a personaliza ReactOS." + IDS_COMPUTERTITLE "Nume computer ºi parolã administrator" + IDS_COMPUTERSUBTITLE "Trebuie sã introduceþi un nume ºi o parolã de administrator pentru computer." + IDS_LOCALETITLE "Setãri regionale" + IDS_LOCALESUBTITLE "Puteþi particulariza ReactOS pentru diferite regiuni sau limbi." + IDS_DATETIMETITLE "Datã ºi timp" + IDS_DATETIMESUBTITLE "Setaþi data corectã pentru computer." + IDS_PROCESSTITLE "Înregistrare componente" + IDS_PROCESSSUBTITLE "Vã rugãm aºteptaþi..." +END + +STRINGTABLE +BEGIN + IDS_CMT_DOWNLOADER "Descãrcare ºi instalare diverse programe." +END + +STRINGTABLE +BEGIN + IDS_ACCESSORIES "Accesorii" + IDS_CMT_CALC "Lansare Calculator" + IDS_CMT_CMD "Pornire linie de comandã" + IDS_CMT_DEVMGMT "Pornire Gestionarul de dispozitive" + IDS_CMT_EVENTVIEW "Pornire Vizualizator de evenimente" + IDS_CMT_EXPLORER "Pornire Explorer" + IDS_CMT_MSCONFIG "Pornire Programul de configurare sistem" + IDS_CMT_NOTEPAD "Pornire Editor de text" + IDS_CMT_RDESKTOP "Pornire Remote Desktop" + IDS_CMT_REGEDIT "Pornire Editor de registri" + IDS_CMT_SCREENSHOT "Efectuare capturã de ecran" + IDS_CMT_SERVMAN "Pornire Gestionar de servicii" + IDS_CMT_WORDPAD "Pornire Editor de documente" + IDS_CMT_PAINT "Pornire Paint" +END + +STRINGTABLE +BEGIN + IDS_GAMES "Jocuri" + IDS_CMT_SOLITAIRE "Solitaire" + IDS_CMT_WINEMINE "WineMine" +END + +STRINGTABLE +BEGIN + IDS_SYS_TOOLS "Unelte de sistem" + IDS_CMT_CHARMAP "Tabel caractere" + IDS_CMT_DXDIAG "Pornire program de diagnostic React-X" + IDS_CMT_KBSWITCH "Comutator de ºablon tastaturã" +END + +STRINGTABLE +BEGIN + IDS_SYS_ACCESSIBILITY "Accesibilitate" + IDS_CMT_MAGNIFY "Lupã" +END + +STRINGTABLE +BEGIN + IDS_SYS_ENTERTAINMENT "Distracþie" + IDS_CMT_MPLAY32 "Pornire Player Multimedia" + IDS_CMT_SNDVOL32 "Pornire Control Volum" +END + +STRINGTABLE +BEGIN + IDS_REACTOS_SETUP "Instalare ReactOS" + IDS_UNKNOWN_ERROR "Eroare necunoscutã" + IDS_REGISTERING_COMPONENTS "Înregistrare componente..." + IDS_LOADLIBRARY_FAILED "LoadLibrary a eºuat: " + IDS_GETPROCADDR_FAILED "GetProcAddr a eºuat: " + IDS_REGSVR_FAILED "DllRegisterServer a eºuat: " + IDS_DLLINSTALL_FAILED "DllInstall a eºuat: " + IDS_TIMEOUT "Timp expirat în timpul înregistrãrii" + IDS_REASON_UNKNOWN "" +END + +STRINGTABLE +BEGIN + IDS_SHORT_CALC "Calculator.lnk" + IDS_SHORT_CHARMAP "Character Map.lnk" + IDS_SHORT_CMD "Linie comandã.lnk" + IDS_SHORT_DEVICE "Gestionar dispozitive.lnk" + IDS_SHORT_DOWNLOADER "Descarcã !.lnk" + IDS_SHORT_DXDIAG "Diagnostic ReactX.lnk" + IDS_SHORT_EVENTVIEW "Vizualizator evenimente.lnk" + IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" + IDS_SHORT_KBSWITCH "Comutator ºablon tastaturã.lnk" + IDS_SHORT_MAGNIFY "Lupã.lnk" + IDS_SHORT_MPLAY32 "Player Multimedia.lnk" + IDS_SHORT_MSCONFIG "Configurare sistem.lnk" + IDS_SHORT_NOTEPAD "Carneþel.lnk" + IDS_SHORT_RDESKTOP "Remote Desktop.lnk" + IDS_SHORT_REGEDIT "Editor de registrii.lnk" + IDS_SHORT_SERVICE "Gestionar de servicii.lnk" + IDS_SHORT_SNAP "Capturã de ecran.lnk" + IDS_SHORT_SNDVOL32 "Control volum.lnk" + IDS_SHORT_SOLITAIRE "Solitaire.lnk" + IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_WORDPAD "WordPad.lnk" + IDS_SHORT_PAINT "Paint.lnk" +END + +STRINGTABLE +BEGIN + IDS_WZD_NAME "Expertul nu poate continua pânã când nu scrieþi un nume." + IDS_WZD_SETCOMPUTERNAME "Expertul nu a putut seta numele computerului." + IDS_WZD_COMPUTERNAME "Expertul nu poate continua pânã când nu scrieþi un nume pentru computer." + IDS_WZD_PASSWORDEMPTY "Trebuie sã scrieþi o parolã !" + IDS_WZD_PASSWORDMATCH "Parolele scrise nu se potrivesc. Vã rugãm rescrieþi parola doritã ºi reîncercaþi." + IDS_WZD_PASSWORDCHAR "Parola introdusã de dumneavoastrã conþine caractere invalide. Rescrieþi parola ºi reîncercaþi." + IDS_WZD_LOCALTIME "Expertul nu a putut seta ora localã." +END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Instalare dispozitive..." +END + +/* EOF */ Propchange: trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/sk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] Tue May 26 16:10:58 2009 @@ -1,6 +1,6 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: 09-02-2008 - * LAST CHANGE: 16-03-2009 + * LAST CHANGE: 14-05-2009 * THANKS TO : Filip Navara and Kamil Hornicek and all good people ;-) */ @@ -86,13 +86,13 @@ LTEXT "Lokalizácia systému by mala súhlasi s jazykom aplikácií, "\ "ktoré chcete pouíva. Lokalizácia urèí ako budú zobrazené "\ "èísla, meny a údaje kalendára.", IDC_STATIC, 53, 7, 253, 20 - LTEXT "<locale text>", IDC_LOCALETEXT, 53, 29, 250, 16 + LTEXT "<text lokality>", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "Pre zmenu lokalizácie systému kliknite na Zmeni.", IDC_STATIC, 53, 60, 184, 8 PUSHBUTTON "&Zmeni...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 LTEXT "Rozloenie kláves urèí znaky, ktoré sa zobrazia, keï píete.", IDC_STATIC, 53, 86, 253, 8 - LTEXT "<layout text>", IDC_LAYOUTTEXT, 53, 100, 250, 16 + LTEXT "<text rozloenia>", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "Pre zmenu rozloenia kláves, kliknite na Zmeni.", IDC_STATIC, 53, 126, 184, 8 PUSHBUTTON "Z&meni...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 @@ -199,7 +199,7 @@ IDS_CMT_RDESKTOP "Spusti Vzdialenú pracovnú plochu" IDS_CMT_EVENTVIEW "Spusti Zobrazovaè udalostí" IDS_CMT_MSCONFIG "Spusti Program na konfiguráciu systému" - IDS_CMT_PAINT "Launch Paint" + IDS_CMT_PAINT "Spusti Skicár" END STRINGTABLE @@ -267,7 +267,7 @@ IDS_SHORT_MSCONFIG "Program na konfiguráciu systému.lnk" IDS_SHORT_SNDVOL32 "Ovládanie hlasitosti.lnk" //Volume Control IDS_SHORT_DXDIAG "Diagnostika ReactX.lnk" - IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_PAINT "Skicár.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.rc [iso-8859-1] Tue May 26 16:10:58 2009 @@ -66,4 +66,5 @@ #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" #include "lang/zh-CN.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc"

1 0

[jimtabor] 41123: - restore missing functions, fix build.
by jimtabor＠svn.reactos.org 26 May '09

26 May '09

Author: jimtabor Date: Tue May 26 10:36:57 2009 New Revision: 41123 URL: http://svn.reactos.org/svn/reactos?rev=41123&view=rev Log: - restore missing functions, fix build. Modified: trunk/reactos/dll/win32/gdi32/objects/printdrv.c Modified: trunk/reactos/dll/win32/gdi32/objects/printdrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pr… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/printdrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/printdrv.c [iso-8859-1] Tue May 26 10:36:57 2009 @@ -358,6 +358,44 @@ /* * @unimplemented */ +HANDLE +WINAPI +GdiGetSpoolFileHandle(LPWSTR pwszPrinterName, + LPDEVMODEW pDevmode, + LPWSTR pwszDocName) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +GdiDeleteSpoolFileHandle(HANDLE SpoolFileHandle) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +DWORD +WINAPI +GdiGetPageCount(HANDLE SpoolFileHandle) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ int WINAPI StartDocW(

1 0

[jimtabor] 41122: - Implementation of gdi printing support. Work in progress. Losts of updates, including missing functions in the winspool spec file.
by jimtabor＠svn.reactos.org 26 May '09

26 May '09

Author: jimtabor Date: Tue May 26 09:50:15 2009 New Revision: 41122 URL: http://svn.reactos.org/svn/reactos?rev=41122&view=rev Log: - Implementation of gdi printing support. Work in progress. Losts of updates, including missing functions in the winspool spec file. Added: trunk/reactos/include/reactos/wine/winspool.h (with props) Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h trunk/reactos/dll/win32/gdi32/include/precomp.h trunk/reactos/dll/win32/gdi32/main/dllmain.c trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/dll/win32/gdi32/objects/printdrv.c trunk/reactos/dll/win32/winspool/winspool.spec trunk/reactos/include/ddk/winddiui.h trunk/reactos/include/psdk/winspool.h trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] Tue May 26 09:50:15 2009 @@ -16,6 +16,8 @@ extern DWORD GDI_BatchLimit; extern PDEVCAPS GdiDevCaps; extern BOOL gbLpk; // Global bool LanguagePack +extern HANDLE ghSpooler; +extern RTL_CRITICAL_SECTION semLocal; typedef INT (CALLBACK* EMFPLAYPROC)( @@ -111,6 +113,38 @@ FONT_ATTR lfa[LOCALFONT_COUNT]; } LOCALFONT, *PLOCALFONT; +// sdk/winspool.h +typedef BOOL WINAPI (*ABORTPRINTER) (HANDLE); +typedef BOOL WINAPI (*CLOSEPRINTER) (HANDLE); +typedef BOOL WINAPI (*CLOSESPOOLFILEHANDLE) (HANDLE, HANDLE); // W2k8 +typedef HANDLE WINAPI (*COMMITSPOOLDATA) (HANDLE,HANDLE,DWORD); // W2k8 +typedef LONG WINAPI (*DOCUMENTPROPERTIESW) (HWND,HANDLE,LPWSTR,PDEVMODEW,PDEVMODEW,DWORD); +typedef BOOL WINAPI (*ENDDOCPRINTER) (HANDLE); +typedef BOOL WINAPI (*ENDPAGEPRINTER) (HANDLE); +typedef BOOL WINAPI (*GETPRINTERW) (HANDLE,DWORD,LPBYTE,DWORD,LPDWORD); +typedef BOOL WINAPI (*GETPRINTERDRIVERW) (HANDLE,LPWSTR,DWORD,LPBYTE,DWORD,LPDWORD); +typedef HANDLE WINAPI (*GETSPOOLFILEHANDLE) (HANDLE); // W2k8 +typedef BOOL WINAPI (*ISVALIDDEVMODEW) (PDEVMODEW,size_t); +typedef BOOL WINAPI (*OPENPRINTERW) (LPWSTR,PHANDLE,LPPRINTER_DEFAULTSW); +typedef BOOL WINAPI (*READPRINTER) (HANDLE,PVOID,DWORD,PDWORD); +typedef BOOL WINAPI (*RESETPRINTERW) (HANDLE,LPPRINTER_DEFAULTSW); +typedef BOOL WINAPI (*STARTDOCDLGW) (HANDLE,DOCINFOW *); +typedef DWORD WINAPI (*STARTDOCPRINTERW) (HANDLE,DWORD,PBYTE); +typedef BOOL WINAPI (*STARTPAGEPRINTER) (HANDLE); +// ddk/winsplp.h +typedef BOOL WINAPI (*SEEKPRINTER) (HANDLE,LARGE_INTEGER,PLARGE_INTEGER,DWORD,BOOL); +typedef BOOL WINAPI (*SPLREADPRINTER) (HANDLE,LPBYTE *,DWORD); +// Same as ddk/winsplp.h DriverUnloadComplete? +typedef BOOL WINAPI (*SPLDRIVERUNLOADCOMPLETE) (LPWSTR); +// Driver support: +// DrvDocumentEvent api/winddiui.h not W2k8 DocumentEventAW +typedef INT WINAPI (*DOCUMENTEVENT) (HANDLE,HDC,INT,ULONG,PVOID,ULONG,PVOID); +// DrvQueryColorProfile +typedef BOOL WINAPI (*QUERYCOLORPROFILE) (HANDLE,PDEVMODEW,ULONG,VOID*,ULONG,FLONG); +// Unknown: +typedef DWORD WINAPI (*QUERYSPOOLMODE) (HANDLE,DWORD,DWORD); +typedef DWORD WINAPI (*QUERYREMOTEFONTS) (DWORD,DWORD,DWORD); + /* FUNCTIONS *****************************************************************/ PVOID @@ -242,4 +276,7 @@ VOID GdiSAPCallback(PLDC pldc); +int FASTCALL DocumentEventEx(PVOID,HANDLE,HDC,int,ULONG,PVOID,ULONG,PVOID); +BOOL FASTCALL LoadTheSpoolerDrv(VOID); + /* EOF */ Modified: trunk/reactos/dll/win32/gdi32/include/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/pr… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/include/precomp.h [iso-8859-1] Tue May 26 09:50:15 2009 @@ -19,6 +19,8 @@ #include <winddi.h> #include <d3dnthal.h> #include <prntfont.h> +#include <winddiui.h> +#include <winspool.h> #include <pseh/pseh2.h> Modified: trunk/reactos/dll/win32/gdi32/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/main/dllma… ============================================================================== --- trunk/reactos/dll/win32/gdi32/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/main/dllmain.c [iso-8859-1] Tue May 26 09:50:15 2009 @@ -14,6 +14,7 @@ PDEVCAPS GdiDevCaps = NULL; PGDIHANDLECACHE GdiHandleCache = NULL; BOOL gbLpk = FALSE; +RTL_CRITICAL_SECTION semLocal; /* * GDI32.DLL does have an entry point for disable threadlibrarycall,. The initialization is done by a call @@ -52,6 +53,7 @@ CurrentProcessId = NtCurrentTeb()->ClientId.UniqueProcess; GDI_BatchLimit = (DWORD) NtCurrentTeb()->ProcessEnvironmentBlock->GdiDCAttributeList; GdiHandleCache = (PGDIHANDLECACHE)NtCurrentTeb()->ProcessEnvironmentBlock->GdiHandleBuffer; + RtlInitializeCriticalSection(&semLocal); } Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] Tue May 26 09:50:15 2009 @@ -19,6 +19,15 @@ ULONG UMdhpdev = 0; HANDLE hspool = NULL; + + if ( !ghSpooler && !LoadTheSpoolerDrv()) + { + DPRINT1("WinSpooler.Drv Did not load!\n"); + } + else + { + DPRINT("WinSpooler.Drv Loaded! hMod -> 0x%x\n", ghSpooler); + } if ((!lpwszDevice) && (!lpwszDriver)) { Modified: trunk/reactos/dll/win32/gdi32/objects/printdrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pr… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/printdrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/printdrv.c [iso-8859-1] Tue May 26 09:50:15 2009 @@ -1,7 +1,229 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel + * PURPOSE: GDI Printing Support + * FILE: dll/win32/gdi32/objects/printdrv.c + * PROGRAMER: + * + */ + +// For the wine code: +/* + * Implementation of some printer driver bits + * + * Copyright 1996 John Harvey + * Copyright 1998 Huw Davies + * Copyright 1998 Andreas Mohr + * Copyright 1999 Klaas van Gend + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + #include "precomp.h" #define NDEBUG #include <debug.h> + +/* GLOBALS *******************************************************************/ +HANDLE ghSpooler = NULL; + +static ABORTPRINTER fpAbortPrinter; +static CLOSEPRINTER fpClosePrinter; +static CLOSESPOOLFILEHANDLE fpCloseSpoolFileHandle; +static COMMITSPOOLDATA fpCommitSpoolData; +//static fpConnectToLd64In32Server; +static DOCUMENTEVENT fpDocumentEvent; +static DOCUMENTPROPERTIESW fpDocumentPropertiesW; +static ENDDOCPRINTER fpEndDocPrinter; +static ENDPAGEPRINTER fpEndPagePrinter; +static GETSPOOLFILEHANDLE fpGetSpoolFileHandle; +static GETPRINTERW fpGetPrinterW; +static GETPRINTERDRIVERW fpGetPrinterDriverW; +static ISVALIDDEVMODEW fpIsValidDevmodeW; +static OPENPRINTERW fpOpenPrinterW; +static QUERYSPOOLMODE fpQuerySpoolMode; +static QUERYREMOTEFONTS fpQueryRemoteFonts; +static QUERYCOLORPROFILE fpQueryColorProfile; +static READPRINTER fpReadPrinter; +static RESETPRINTERW fpResetPrinterW; +static SEEKPRINTER fpSeekPrinter; +static SPLDRIVERUNLOADCOMPLETE fpSplDriverUnloadComplete; +static SPLREADPRINTER fpSplReadPrinter; +static STARTDOCDLGW fpStartDocDlgW; +static STARTDOCPRINTERW fpStartDocPrinterW; +static STARTPAGEPRINTER fpStartPagePrinter; + +/* PRIVATE FUNCTIONS *********************************************************/ + +static +int +FASTCALL +IntEndPage( + HDC hdc, + BOOL Form + ) +{ + PLDC pldc; + int Ret = SP_ERROR; + ULONG hType = GDI_HANDLE_GET_TYPE(hdc); + + if (hType == GDILoObjType_LO_DC_TYPE || hType == GDILoObjType_LO_METADC16_TYPE) + { + SetLastError(ERROR_INVALID_HANDLE); + return SP_ERROR; + } + + pldc = GdiGetLDC(hdc); + if ( !pldc ) + { + SetLastError(ERROR_INVALID_HANDLE); + return SP_ERROR; + } + + return Ret; +} + +/* FUNCTIONS *****************************************************************/ + +int +FASTCALL +DocumentEventEx( + PVOID pvUMPDev, + HANDLE hPrinter, + HDC hdc, + int iEsc, + ULONG cbIn, + PVOID pvIn, + ULONG cbOut, + PVOID pvOut + ) +{ + return fpDocumentEvent(hPrinter,hdc,iEsc,cbIn,pvIn,cbOut,pvOut); +} + +BOOL +FASTCALL +EndDocPrinterEx( + PVOID pvUMPDev, + HANDLE hPrinter + ) +{ + return fpEndDocPrinter(hPrinter); +} + +BOOL +FASTCALL +EndPagePrinterEx( + PVOID pvUMPDev, + HANDLE hPrinter + ) +{ + return fpEndPagePrinter(hPrinter); +} + +BOOL +FASTCALL +LoadTheSpoolerDrv(VOID) +{ + HMODULE hModWinSpoolDrv; + + if ( !ghSpooler ) + { + RtlEnterCriticalSection(&semLocal); + + hModWinSpoolDrv = LoadLibraryW(L"WINSPOOL.DRV"); + + if (hModWinSpoolDrv) + { + fpAbortPrinter = GetProcAddress(hModWinSpoolDrv, "AbortPrinter"); + fpClosePrinter = GetProcAddress(hModWinSpoolDrv, "ClosePrinter"); + fpCloseSpoolFileHandle = GetProcAddress(hModWinSpoolDrv, "CloseSpoolFileHandle"); + fpCommitSpoolData = (PVOID)GetProcAddress(hModWinSpoolDrv, "CommitSpoolData"); + // fpConnectToLd64In32Server = GetProcAddress(hModWinSpoolDrv, (LPCSTR)224); + fpDocumentEvent = (PVOID)GetProcAddress(hModWinSpoolDrv,"DocumentEvent"); + fpDocumentPropertiesW = (PVOID)GetProcAddress(hModWinSpoolDrv, "DocumentPropertiesW"); + fpEndDocPrinter = GetProcAddress(hModWinSpoolDrv, "EndDocPrinter"); + fpEndPagePrinter = GetProcAddress(hModWinSpoolDrv, "EndPagePrinter"); + fpGetPrinterW = GetProcAddress( hModWinSpoolDrv,"GetPrinterW"); + fpGetPrinterDriverW = GetProcAddress(hModWinSpoolDrv,"GetPrinterDriverW"); + fpGetSpoolFileHandle = (PVOID)GetProcAddress(hModWinSpoolDrv, "GetSpoolFileHandle"); + fpIsValidDevmodeW = GetProcAddress(hModWinSpoolDrv, "IsValidDevmodeW"); + fpOpenPrinterW = GetProcAddress(hModWinSpoolDrv, "OpenPrinterW"); + fpQueryColorProfile = GetProcAddress(hModWinSpoolDrv,"QueryColorProfile"); + fpQueryRemoteFonts = (PVOID)GetProcAddress(hModWinSpoolDrv, "QueryRemoteFonts"); + fpQuerySpoolMode = (PVOID)GetProcAddress(hModWinSpoolDrv, "QuerySpoolMode"); + fpReadPrinter = GetProcAddress(hModWinSpoolDrv, "ReadPrinter"); + fpResetPrinterW = GetProcAddress(hModWinSpoolDrv, "ResetPrinterW"); + fpSeekPrinter = GetProcAddress(hModWinSpoolDrv, "SeekPrinter"); + fpSplDriverUnloadComplete = GetProcAddress(hModWinSpoolDrv, "SplDriverUnloadComplete"); + fpSplReadPrinter = GetProcAddress(hModWinSpoolDrv, (LPCSTR)205); + fpStartDocDlgW = GetProcAddress(hModWinSpoolDrv, "StartDocDlgW"); + fpStartDocPrinterW = (PVOID)GetProcAddress(hModWinSpoolDrv, "StartDocPrinterW"); + fpStartPagePrinter = GetProcAddress(hModWinSpoolDrv, "StartPagePrinter"); + + if ( !fpAbortPrinter || + !fpClosePrinter || + !fpCloseSpoolFileHandle || + !fpCommitSpoolData || + !fpDocumentEvent || + !fpDocumentPropertiesW || + !fpEndDocPrinter || + !fpEndPagePrinter || + !fpGetPrinterW || + !fpGetPrinterDriverW || + !fpGetSpoolFileHandle || + !fpIsValidDevmodeW || + !fpOpenPrinterW || + !fpQueryColorProfile || + !fpQueryRemoteFonts || + !fpQuerySpoolMode || + !fpReadPrinter || + !fpResetPrinterW || + !fpSeekPrinter || + !fpSplDriverUnloadComplete || + !fpSplReadPrinter || + !fpStartDocDlgW || + !fpStartDocPrinterW || + !fpStartPagePrinter ) + { + FreeLibrary(hModWinSpoolDrv); + hModWinSpoolDrv = NULL; + } + ghSpooler = hModWinSpoolDrv; + } + RtlLeaveCriticalSection(&semLocal); + } + else + return TRUE; + + if ( !ghSpooler ) SetLastError(ERROR_NOT_ENOUGH_MEMORY); + + return (ghSpooler != NULL); +} + +BOOL +FASTCALL +StartPagePrinterEx( + PVOID pvUMPDev, + HANDLE hPrinter + ) +{ + return fpStartPagePrinter(hPrinter); +} + +/* SYSCALLS ******************************************************************/ /* * @unimplemented @@ -21,16 +243,18 @@ SetLastError(ERROR_INVALID_HANDLE); return SP_ERROR; } + pldc = GdiGetLDC(hdc); if ( !pldc ) { SetLastError(ERROR_INVALID_HANDLE); return SP_ERROR; } + if ( !(pldc->Flags & LDC_INIT_DOCUMENT) ) return 1; - /* winspool:DocumentEvent printer driver */ - + DocumentEventEx(NULL, pldc->hPrinter, hdc, DOCUMENTEVENT_ABORTDOC, 0, NULL, 0, NULL); + ((PW32CLIENTINFO)NtCurrentTeb()->Win32ClientInfo)->cSpins = 0; if ( pldc->Flags & LDC_META_PRINT) @@ -42,13 +266,12 @@ if (NtGdiAbortDoc(hdc)) { - /* winspool:AbortPrinter driver */ - Ret = 1; + if (fpAbortPrinter(pldc->hPrinter)) Ret = 1; } else Ret = SP_ERROR; - pldc->Flags &= ~(LDC_META_PRINT|LDC_STARTPAGE|LDC_INIT_PAGE|LDC_INIT_DOCUMENT|LDC_SAPCALLBACK); + pldc->Flags &= ~(LDC_ATENDPAGE|LDC_META_PRINT|LDC_STARTPAGE|LDC_INIT_PAGE|LDC_INIT_DOCUMENT|LDC_SAPCALLBACK); return Ret; } @@ -62,64 +285,66 @@ HDC hdc ) { + PLDC pldc; + int Ret = SP_ERROR; + ULONG hType = GDI_HANDLE_GET_TYPE(hdc); + + if (hType == GDILoObjType_LO_DC_TYPE || hType == GDILoObjType_LO_METADC16_TYPE) + { + SetLastError(ERROR_INVALID_HANDLE); + return SP_ERROR; + } + + pldc = GdiGetLDC(hdc); + if ( !pldc ) + { + SetLastError(ERROR_INVALID_HANDLE); + return SP_ERROR; + } + + if (pldc->Flags & LDC_META_PRINT) + { UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -HANDLE -WINAPI -GdiGetSpoolFileHandle(LPWSTR pwszPrinterName, - LPDEVMODEW pDevmode, - LPWSTR pwszDocName) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -GdiDeleteSpoolFileHandle(HANDLE SpoolFileHandle) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -DWORD -WINAPI -GdiGetPageCount(HANDLE SpoolFileHandle) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/* - * @unimplemented + return Ret; + } + + if (pldc->Flags & LDC_INIT_DOCUMENT) + { + BOOL Good; + if (pldc->Flags & LDC_ENDPAGE_MFDC) EndPage(hdc); + + DocumentEventEx(NULL, pldc->hPrinter, hdc, DOCUMENTEVENT_ENDDOC, 0, NULL, 0, NULL); + + ((PW32CLIENTINFO)NtCurrentTeb()->Win32ClientInfo)->cSpins = 0; + + Good = NtGdiEndDoc(hdc); + + if (Good) + Good = EndDocPrinterEx(NULL,pldc->hPrinter); + + if (Good) + { + DocumentEventEx(NULL, pldc->hPrinter, hdc, DOCUMENTEVENT_ENDDOCPOST, 0, NULL, 0, NULL); + Ret = 1; + } + pldc->Flags &= ~(LDC_ATENDPAGE|LDC_STARTPAGE|LDC_INIT_DOCUMENT|LDC_SAPCALLBACK); + } + return Ret; +} + +/* + * @implemented */ int WINAPI EndFormPage(HDC hdc) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented + return IntEndPage(hdc,TRUE); +} + +/* + * @implemented */ int WINAPI @@ -127,9 +352,138 @@ HDC hdc ) { + return IntEndPage(hdc,FALSE); +} + +/* + * @unimplemented + */ +int +WINAPI +StartDocW( + HDC hdc, + CONST DOCINFOW *lpdi + ) +{ + PLDC pldc; + ULONG hType = GDI_HANDLE_GET_TYPE(hdc); + + if (hType == GDILoObjType_LO_DC_TYPE || hType == GDILoObjType_LO_METADC16_TYPE) + { + SetLastError(ERROR_INVALID_HANDLE); + return SP_ERROR; + } + + pldc = GdiGetLDC(hdc); + if ( !pldc ) + { + SetLastError(ERROR_INVALID_HANDLE); + return SP_ERROR; + } + + return NtGdiStartDoc ( hdc, (DOCINFOW *)lpdi, NULL, 0); +} + +/* + * @implemented + */ +int +WINAPI +StartDocA( + HDC hdc, + CONST DOCINFOA *lpdi + ) +{ + LPWSTR szDocName = NULL, szOutput = NULL, szDatatype = NULL; + DOCINFOW docW; + INT ret, len; + + docW.cbSize = lpdi->cbSize; + if (lpdi->lpszDocName) + { + len = MultiByteToWideChar(CP_ACP,0,lpdi->lpszDocName,-1,NULL,0); + szDocName = HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP,0,lpdi->lpszDocName,-1,szDocName,len); + } + if (lpdi->lpszOutput) + { + len = MultiByteToWideChar(CP_ACP,0,lpdi->lpszOutput,-1,NULL,0); + szOutput = HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP,0,lpdi->lpszOutput,-1,szOutput,len); + } + if (lpdi->lpszDatatype) + { + len = MultiByteToWideChar(CP_ACP,0,lpdi->lpszDatatype,-1,NULL,0); + szDatatype = HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP,0,lpdi->lpszDatatype,-1,szDatatype,len); + } + + docW.lpszDocName = szDocName; + docW.lpszOutput = szOutput; + docW.lpszDatatype = szDatatype; + docW.fwType = lpdi->fwType; + + ret = StartDocW(hdc, &docW); + + HeapFree( GetProcessHeap(), 0, szDocName ); + HeapFree( GetProcessHeap(), 0, szOutput ); + HeapFree( GetProcessHeap(), 0, szDatatype ); + + return ret; +} + +/* + * @unimplemented + */ +int +WINAPI +StartPage( + HDC hdc + ) +{ + PLDC pldc; + ULONG hType = GDI_HANDLE_GET_TYPE(hdc); + + if (hType == GDILoObjType_LO_DC_TYPE || hType == GDILoObjType_LO_METADC16_TYPE) + { + SetLastError(ERROR_INVALID_HANDLE); + return SP_ERROR; + } + + pldc = GdiGetLDC(hdc); + if ( !pldc ) + { + SetLastError(ERROR_INVALID_HANDLE); + return SP_ERROR; + } + + if (pldc->Flags & LDC_META_PRINT) + { UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + return SP_ERROR; + } + + pldc->Flags &= ~(LDC_STARTPAGE); + + if (pldc->Flags & LDC_ENDPAGE_MFDC) return 1; + + if (DocumentEventEx(NULL, pldc->hPrinter, hdc, DOCUMENTEVENT_STARTPAGE, 0, NULL, 0, NULL) != SP_ERROR) + { + pldc->Flags |= LDC_INIT_PAGE; + + ((PW32CLIENTINFO)NtCurrentTeb()->Win32ClientInfo)->cSpins = 0; + + if (StartPagePrinterEx(NULL, pldc->hPrinter)) + { + if (NtGdiStartPage(hdc)) return 1; + } + + pldc->Flags &= ~(LDC_INIT_PAGE); + EndDoc(hdc); + SetLastError(ERROR_INVALID_HANDLE); + } + return SP_ERROR; } /* @@ -172,45 +526,3 @@ return SP_ERROR; } -/* - * @unimplemented - */ -int -WINAPI -StartDocW( - HDC hdc, - CONST DOCINFOW *a1 - ) -{ - return NtGdiStartDoc ( hdc, (DOCINFOW *)a1, NULL, 0); -} - -/* - * @unimplemented - */ -int -WINAPI -StartDocA( - HDC hdc, - CONST DOCINFOA *lpdi - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -int -WINAPI -StartPage( - HDC hdc - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - Modified: trunk/reactos/dll/win32/winspool/winspool.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winspool/winspoo… ============================================================================== --- trunk/reactos/dll/win32/winspool/winspool.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winspool/winspool.spec [iso-8859-1] Tue May 26 09:50:15 2009 @@ -65,11 +65,13 @@ @ stdcall AdvancedDocumentPropertiesW(long long wstr ptr ptr) @ stub AdvancedSetupDialog @ stdcall ClosePrinter(long) +@ stub CloseSpoolFileHandle @ stdcall ConfigurePortA(str long str) @ stdcall ConfigurePortW(wstr long wstr) @ stdcall ConnectToPrinterDlg(long long) @ stub ConvertAnsiDevModeToUnicodeDevMode @ stub ConvertUnicodeDevModeToAnsiDevMode +@ stub CommitSpoolData @ stub CreatePrinterIC @ stub DEVICECAPABILITIES @ stub DEVICEMODE @@ -147,16 +149,23 @@ @ stdcall GetPrinterW(long long ptr long ptr) @ stdcall GetPrintProcessorDirectoryA(str str long ptr long ptr) @ stdcall GetPrintProcessorDirectoryW(wstr wstr long ptr long ptr) +@ stub GetSpoolFileHandle +@ stub IsValidDevmodeA +@ stub IsValidDevmodeW @ stdcall OpenPrinterA(str ptr ptr) @ stdcall OpenPrinterW(wstr ptr ptr) @ stub PlayGdiScriptOnPrinterIC @ stdcall PrinterMessageBoxA(ptr long ptr str str long) @ stdcall PrinterMessageBoxW(ptr long ptr wstr wstr long) @ stdcall PrinterProperties(long long) +@ stub QueryColorProfile +@ stub QuerySpoolMode +@ stub QueryRemoteFonts @ stdcall ReadPrinter(long ptr long ptr) @ stdcall ResetPrinterA(long ptr) @ stdcall ResetPrinterW(long ptr) @ stdcall ScheduleJob(long long) +@ stub SeekPrinter @ stub SetAllocFailCount @ stdcall SetFormA(long str long ptr) @ stdcall SetFormW(long wstr long ptr) @@ -168,9 +177,12 @@ @ stdcall SetPrinterDataExW(long wstr wstr long ptr long) @ stdcall SetPrinterDataW(long wstr long ptr long) @ stdcall SetPrinterW(long long ptr long) +@ stub SplDriverUnloadComplete @ stub SpoolerDevQueryPrintW @ stdcall SpoolerInit() @ stub SpoolerPrinterEvent +@ stub StartDocDlgA +@ stub StartDocDlgW @ stdcall StartDocPrinterA(long long ptr) @ stdcall StartDocPrinterW(long long ptr) @ stdcall StartPagePrinter(long) Modified: trunk/reactos/include/ddk/winddiui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddiui.h?rev… ============================================================================== --- trunk/reactos/include/ddk/winddiui.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddiui.h [iso-8859-1] Tue May 26 09:50:15 2009 @@ -27,6 +27,51 @@ extern "C" { #endif +#define DOCUMENTEVENT_FIRST 1 +#define DOCUMENTEVENT_CREATEDCPRE 1 +#define DOCUMENTEVENT_CREATEDCPOST 2 +#define DOCUMENTEVENT_RESETDCPRE 3 +#define DOCUMENTEVENT_RESETDCPOST 4 +#define DOCUMENTEVENT_STARTDOC 5 +#define DOCUMENTEVENT_STARTDOCPRE 5 +#define DOCUMENTEVENT_STARTPAGE 6 +#define DOCUMENTEVENT_ENDPAGE 7 +#define DOCUMENTEVENT_ENDDOC 8 +#define DOCUMENTEVENT_ENDDOCPRE 8 +#define DOCUMENTEVENT_ABORTDOC 9 +#define DOCUMENTEVENT_DELETEDC 10 +#define DOCUMENTEVENT_ESCAPE 11 +#define DOCUMENTEVENT_ENDDOCPOST 12 +#define DOCUMENTEVENT_STARTDOCPOST 13 +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define DOCUMENTEVENT_QUERYFILTER 14 +#define DOCUMENTEVENT_XPS_ADDFIXEDDOCUMENTSEQUENCEPRE 1 +#define DOCUMENTEVENT_XPS_ADDFIXEDDOCUMENTPRE 2 +#define DOCUMENTEVENT_XPS_ADDFIXEDPAGEEPRE 3 +#define DOCUMENTEVENT_XPS_ADDFIXEDPAGEPOST 4 +#define DOCUMENTEVENT_XPS_ADDFIXEDDOCUMENTPOST 5 +#define DOCUMENTEVENT_XPS_CANCELJOB 6 +#define DOCUMENTEVENT_XPS_ADDFIXEDDOCUMENTSEQUENCEPRINTTICKETPRE 7 +#define DOCUMENTEVENT_XPS_ADDFIXEDDOCUMENTPRINTTICKETPRE 8 +#define DOCUMENTEVENT_XPS_ADDFIXEDPAGEPRINTTICKETPRE 9 +#define DOCUMENTEVENT_XPS_ADDFIXEDPAGEPRINTTICKETPOST 10 +#define DOCUMENTEVENT_XPS_ADDFIXEDDOCUMENTPRINTTICKETPOST 11 +#define DOCUMENTEVENT_XPS_ADDFIXEDDOCUMENTSEQUENCEPRINTTICKETPOST 12 +#define DOCUMENTEVENT_XPS_ADDFIXEDDOCUMENTSEQUENCEPOST 13 +#define DOCUMENTEVENT_LAST 15 +#elif (NTDDI_VERSION >= NTDDI_WINXP) +#define DOCUMENTEVENT_QUERYFILTER 14 +#define DOCUMENTEVENT_LAST 15 +#else +#define DOCUMENTEVENT_LAST 14 +#endif +#define DOCUMENTEVENT_SPOOLED 0x10000 +#define DOCUMENTEVENT_SUCCESS 1 +#define DOCUMENTEVENT_UNSUPPORTED 0 +#define DOCUMENTEVENT_FAILURE -1 + +int WINAPI DrvDocumentEvent(HANDLE,HDC,int,ULONG,PVOID,ULONG,PVOID); + #define DRIVER_EVENT_INITIALIZE 1 #define DRIVER_EVENT_DELETE 2 Modified: trunk/reactos/include/psdk/winspool.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winspool.h?re… ============================================================================== --- trunk/reactos/include/psdk/winspool.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winspool.h [iso-8859-1] Tue May 26 09:50:15 2009 @@ -845,6 +845,10 @@ BOOL WINAPI GetPrinterDriverDirectoryW(LPWSTR,LPWSTR,DWORD,LPBYTE,DWORD,LPDWORD); BOOL WINAPI GetPrintProcessorDirectoryA(LPSTR,LPSTR,DWORD,LPBYTE,DWORD,LPDWORD); BOOL WINAPI GetPrintProcessorDirectoryW(LPWSTR,LPWSTR,DWORD,LPBYTE,DWORD,LPDWORD); +#if NTDDI_VERSION >= NTDDI_WINXPSP2 +BOOL WINAPI IsValidDevmodeA(PDEVMODEA,size_t); +BOOL WINAPI IsValidDevmodeW(PDEVMODEW,size_t); +#endif BOOL WINAPI OpenPrinterA(LPSTR,PHANDLE,LPPRINTER_DEFAULTSA); BOOL WINAPI OpenPrinterW(LPWSTR,PHANDLE,LPPRINTER_DEFAULTSW); DWORD WINAPI PrinterMessageBoxA(HANDLE,DWORD,HWND,LPSTR,LPSTR,DWORD); @@ -934,6 +938,7 @@ #define GetPrinterDriver GetPrinterDriverW #define GetPrinterDriverDirectory GetPrinterDriverDirectoryW #define GetPrintProcessorDirectory GetPrintProcessorDirectoryW +#define IsValidDevmode IsValidDevmodeW #define OpenPrinter OpenPrinterW #define PrinterMessageBox PrinterMessageBoxW #define ResetPrinter ResetPrinterW @@ -1003,6 +1008,7 @@ #define GetPrinterDriver GetPrinterDriverA #define GetPrinterDriverDirectory GetPrinterDriverDirectoryA #define GetPrintProcessorDirectory GetPrintProcessorDirectoryA +#define IsValidDevmode IsValidDevmodeA #define OpenPrinter OpenPrinterA #define PrinterMessageBox PrinterMessageBoxA #define ResetPrinter ResetPrinterA Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] Tue May 26 09:50:15 2009 @@ -185,6 +185,8 @@ #define LDC_META_PRINT 0x00020000 #define LDC_INFODC 0x01000000 /* If CreateIC was passed. */ #define LDC_DEVCAPS 0x02000000 +#define LDC_ATENDPAGE 0x10000000 +#define LDC_ENDPAGE_MFDC 0x80000000 /* DC_ATTR Xform Flags */ #define METAFILE_TO_WORLD_IDENTITY 0x00000001 Added: trunk/reactos/include/reactos/wine/winspool.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winsp… ============================================================================== --- trunk/reactos/include/reactos/wine/winspool.h (added) +++ trunk/reactos/include/reactos/wine/winspool.h [iso-8859-1] Tue May 26 09:50:15 2009 @@ -1,0 +1,51 @@ +/* Definitions for printing + * + * Copyright 1998 Huw Davies, Andreas Mohr + * + * Portions Copyright (c) 1999 Corel Corporation + * (Paul Quinn, Albert Den Haan) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __WINE_WINSPOOL_H +#define __WINE_WINSPOOL_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* + * Compatibility header + */ + +#if !defined(_MSC_VER) +#include_next "winspool.h" +#endif + + +/* DECLARATIONS */ +LONG WINAPI ExtDeviceMode( HWND hWnd, HANDLE hInst, LPDEVMODEA pDevModeOutput, + LPSTR pDeviceName, LPSTR pPort, LPDEVMODEA pDevModeInput, LPSTR pProfile, + DWORD fMode); + +LPSTR WINAPI StartDocDlgA(HANDLE hPrinter, DOCINFOA *doc); +LPWSTR WINAPI StartDocDlgW(HANDLE hPrinter, DOCINFOW *doc); +#define StartDocDlg WINELIB_NAME_AW(StartDocDlg) + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* __WINE_WINSPOOL_H */ Propchange: trunk/reactos/include/reactos/wine/winspool.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/reactos/wine/winspool.h ------------------------------------------------------------------------------ svn:mime-type = text/plain

1 0

[tkreuzer] 41121: MmGrowKernelStack: go back to the ASSERT and add a fixed check
by tkreuzer＠svn.reactos.org 25 May '09

25 May '09

Author: tkreuzer Date: Tue May 26 02:38:00 2009 New Revision: 41121 URL: http://svn.reactos.org/svn/reactos?rev=41121&view=rev Log: MmGrowKernelStack: go back to the ASSERT and add a fixed check Added: trunk/reactos/dll/win32/msacm32/msacm32.drv/ (with props) trunk/reactos/dll/win32/msacm32/msacm32.drv/msacm32.drv.rbuild (with props) trunk/reactos/dll/win32/msacm32/msacm32.drv/msacm32.drv.spec (with props) trunk/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c (with props) trunk/reactos/dll/win32/msacm32/msacm32.drv/wavemap.rc (with props) Removed: trunk/reactos/dll/win32/winmm/wavemap/ Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/msacm32/msacm32.rbuild trunk/reactos/dll/win32/winmm/winmm.rbuild Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Tue May 26 02:38:00 2009 @@ -319,6 +319,7 @@ dll\win32\mpr\mpr.dll 1 dll\win32\mprapi\mprapi.dll 1 dll\win32\msacm32\msacm32.dll 1 +dll\win32\msacm32\msacm32.drv\msacm32.drv 1 dll\win32\msadp32.acm\msadp32.acm 1 dll\win32\msafd\msafd.dll 1 dll\win32\mscat32\mscat32.dll 1 @@ -455,7 +456,6 @@ dll\win32\xinput1_3\xinput1_3.dll 1 dll\win32\xinput9_1_0\xinput9_1_0.dll 1 dll\win32\winmm\midimap\midimap.dll 1 -dll\win32\winmm\wavemap\msacm32.drv 1 optional dll\win32\wdmaud.drv\wdmaud.drv 1 ; Shell Extensions Propchange: trunk/reactos/dll/win32/msacm32/msacm32.drv/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue May 26 02:38:00 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/msacm32/msacm32.drv/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/msacm32/msacm32.drv/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/msacm32/msacm32.drv/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/msacm32/msacm32.drv/msacm32.drv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm32.… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm32.drv/msacm32.drv.rbuild (added) +++ trunk/reactos/dll/win32/msacm32/msacm32.drv/msacm32.drv.rbuild [iso-8859-1] Tue May 26 02:38:00 2009 @@ -1,0 +1,13 @@ +<module name="msacm32.drv" type="win32dll" entrypoint="0" extension=".drv" baseaddress="${BASEADDRESS_WAVEMAP}" installbase="system32" installname="msacm32.drv" unicode="yes"> + <importlibrary definition="msacm32.drv.spec" /> + <include base="msacm32.drv">.</include> + <include base="ReactOS">include/reactos/wine</include> + <library>wine</library> + <library>msacm32</library> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>winmm</library> + <file>wavemap.c</file> + <file>wavemap.rc</file> +</module> Propchange: trunk/reactos/dll/win32/msacm32/msacm32.drv/msacm32.drv.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/msacm32/msacm32.drv/msacm32.drv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm32.… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm32.drv/msacm32.drv.spec (added) +++ trunk/reactos/dll/win32/msacm32/msacm32.drv/msacm32.drv.spec [iso-8859-1] Tue May 26 02:38:00 2009 @@ -1,0 +1,3 @@ +@ stdcall -private DriverProc(long long long long long) WAVEMAP_DriverProc +@ stdcall -private widMessage(long long long long long) WAVEMAP_widMessage +@ stdcall -private wodMessage(long long long long long) WAVEMAP_wodMessage Propchange: trunk/reactos/dll/win32/msacm32/msacm32.drv/msacm32.drv.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm32.… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c (added) +++ trunk/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c [iso-8859-1] Tue May 26 02:38:00 2009 @@ -1,0 +1,1242 @@ +/* -*- tab-width: 8; c-basic-offset: 4 -*- */ +/* + * Wine Wave mapper driver + * + * Copyright 1999,2001 Eric Pouech + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* TODOs + * + better protection against evilish dwUser parameters + * + use asynchronous ACM conversion + * + don't use callback functions when none is required in open + * + the buffer sizes may not be accurate, so there may be some + * remaining bytes in src and dst buffers after ACM conversions... + * those should be taken care of... + */ + +#include <stdarg.h> +#include <string.h> +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "mmddk.h" +#include "mmreg.h" +#include "msacm.h" +#include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wavemap); + +typedef struct tagWAVEMAPDATA { + struct tagWAVEMAPDATA* self; + union { + struct { + HWAVEOUT hOuterWave; + HWAVEOUT hInnerWave; + } out; + struct { + HWAVEIN hOuterWave; + HWAVEIN hInnerWave; + } in; + } u; + HACMSTREAM hAcmStream; + /* needed data to filter callbacks. Only needed when hAcmStream is not 0 */ + DWORD_PTR dwCallback; + DWORD_PTR dwClientInstance; + DWORD dwFlags; + /* ratio to compute position from a PCM playback to any format */ + DWORD avgSpeedOuter; + DWORD avgSpeedInner; + /* channel size of inner and outer */ + DWORD nSamplesPerSecOuter; + DWORD nSamplesPerSecInner; +} WAVEMAPDATA; + +static BOOL WAVEMAP_IsData(const WAVEMAPDATA* wm) +{ + return (!IsBadReadPtr(wm, sizeof(WAVEMAPDATA)) && wm->self == wm); +} + +/*======================================================================* + * WAVE OUT part * + *======================================================================*/ + +static void CALLBACK wodCallback(HWAVEOUT hWave, UINT uMsg, DWORD_PTR dwInstance, + DWORD_PTR dwParam1, DWORD_PTR dwParam2) +{ + WAVEMAPDATA* wom = (WAVEMAPDATA*)dwInstance; + + TRACE("(%p %u %ld %lx %lx);\n", hWave, uMsg, dwInstance, dwParam1, dwParam2); + + if (!WAVEMAP_IsData(wom)) { + ERR("Bad data\n"); + return; + } + + if (uMsg != WOM_OPEN && hWave != wom->u.out.hInnerWave) + ERR("Shouldn't happen (%p %p)\n", hWave, wom->u.out.hInnerWave); + + switch (uMsg) { + case WOM_OPEN: + case WOM_CLOSE: + /* dwParam1 & dwParam2 are supposed to be 0, nothing to do */ + break; + case WOM_DONE: + if (wom->hAcmStream) { + LPWAVEHDR lpWaveHdrDst = (LPWAVEHDR)dwParam1; + PACMSTREAMHEADER ash = (PACMSTREAMHEADER)((LPSTR)lpWaveHdrDst - sizeof(ACMSTREAMHEADER)); + LPWAVEHDR lpWaveHdrSrc = (LPWAVEHDR)ash->dwUser; + + lpWaveHdrSrc->dwFlags &= ~WHDR_INQUEUE; + lpWaveHdrSrc->dwFlags |= WHDR_DONE; + dwParam1 = (DWORD_PTR)lpWaveHdrSrc; + } + break; + default: + ERR("Unknown msg %u\n", uMsg); + } + + DriverCallback(wom->dwCallback, HIWORD(wom->dwFlags), (HDRVR)wom->u.out.hOuterWave, + uMsg, wom->dwClientInstance, dwParam1, dwParam2); +} + +/****************************************************************** + * wodOpenHelper + * + * + */ +static DWORD wodOpenHelper(WAVEMAPDATA* wom, UINT idx, + LPWAVEOPENDESC lpDesc, LPWAVEFORMATEX lpwfx, + DWORD dwFlags) +{ + DWORD ret; + + TRACE("(%p %04x %p %p %08x)\n", wom, idx, lpDesc, lpwfx, dwFlags); + + /* destination is always PCM, so the formulas below apply */ + lpwfx->nBlockAlign = (lpwfx->nChannels * lpwfx->wBitsPerSample) / 8; + lpwfx->nAvgBytesPerSec = lpwfx->nSamplesPerSec * lpwfx->nBlockAlign; + if (dwFlags & WAVE_FORMAT_QUERY) { + ret = acmStreamOpen(NULL, 0, lpDesc->lpFormat, lpwfx, NULL, 0L, 0L, ACM_STREAMOPENF_QUERY); + } else { + ret = acmStreamOpen(&wom->hAcmStream, 0, lpDesc->lpFormat, lpwfx, NULL, 0L, 0L, 0L); + } + if (ret == MMSYSERR_NOERROR) { + ret = waveOutOpen(&wom->u.out.hInnerWave, idx, lpwfx, + (DWORD_PTR)wodCallback, (DWORD_PTR)wom, + (dwFlags & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION); + if (ret != MMSYSERR_NOERROR && !(dwFlags & WAVE_FORMAT_QUERY)) { + acmStreamClose(wom->hAcmStream, 0); + wom->hAcmStream = 0; + } + } + TRACE("ret = %08x\n", ret); + return ret; +} + +static DWORD wodOpen(DWORD_PTR *lpdwUser, LPWAVEOPENDESC lpDesc, DWORD dwFlags) +{ + UINT ndlo, ndhi; + UINT i; + WAVEMAPDATA* wom = HeapAlloc(GetProcessHeap(), 0, sizeof(WAVEMAPDATA)); + DWORD res; + + TRACE("(%p %p %08x)\n", lpdwUser, lpDesc, dwFlags); + + if (!wom) { + WARN("no memory\n"); + return MMSYSERR_NOMEM; + } + + ndhi = waveOutGetNumDevs(); + if (dwFlags & WAVE_MAPPED) { + if (lpDesc->uMappedDeviceID >= ndhi) { + WARN("invalid parameter: dwFlags WAVE_MAPPED\n"); + HeapFree(GetProcessHeap(), 0, wom); + return MMSYSERR_INVALPARAM; + } + ndlo = lpDesc->uMappedDeviceID; + ndhi = ndlo + 1; + dwFlags &= ~WAVE_MAPPED; + } else { + ndlo = 0; + } + wom->self = wom; + wom->dwCallback = lpDesc->dwCallback; + wom->dwFlags = dwFlags; + wom->dwClientInstance = lpDesc->dwInstance; + wom->u.out.hOuterWave = (HWAVEOUT)lpDesc->hWave; + wom->avgSpeedOuter = wom->avgSpeedInner = lpDesc->lpFormat->nAvgBytesPerSec; + wom->nSamplesPerSecOuter = wom->nSamplesPerSecInner = lpDesc->lpFormat->nSamplesPerSec; + + for (i = ndlo; i < ndhi; i++) { + /* if no ACM stuff is involved, no need to handle callbacks at this + * level, this will be done transparently + */ + if (waveOutOpen(&wom->u.out.hInnerWave, i, lpDesc->lpFormat, + (DWORD_PTR)wodCallback, (DWORD_PTR)wom, + (dwFlags & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION | WAVE_FORMAT_DIRECT) == MMSYSERR_NOERROR) { + wom->hAcmStream = 0; + goto found; + } + } + + if ((dwFlags & WAVE_FORMAT_DIRECT) == 0) { + WAVEFORMATEX wfx; + + wfx.wFormatTag = WAVE_FORMAT_PCM; + wfx.cbSize = 0; /* normally, this field is not used for PCM format, just in case */ + /* try some ACM stuff */ + +#define TRY(sps,bps) wfx.nSamplesPerSec = (sps); wfx.wBitsPerSample = (bps); \ + switch (res=wodOpenHelper(wom, i, lpDesc, &wfx, dwFlags | WAVE_FORMAT_DIRECT)) { \ + case MMSYSERR_NOERROR: wom->avgSpeedInner = wfx.nAvgBytesPerSec; wom->nSamplesPerSecInner = wfx.nSamplesPerSec; goto found; \ + case WAVERR_BADFORMAT: break; \ + default: goto error; \ + } + + if (lpDesc->lpFormat->wFormatTag != WAVE_FORMAT_PCM) { + /* Format changed so keep sample rate and number of channels + * the same and just change the bit depth + */ + for (i = ndlo; i < ndhi; i++) { + wfx.nSamplesPerSec=lpDesc->lpFormat->nSamplesPerSec; + wfx.nChannels = lpDesc->lpFormat->nChannels; + TRY(wfx.nSamplesPerSec, 16); + TRY(wfx.nSamplesPerSec, 8); + } + } else { + /* Our resampling algorithm is quite primitive so first try + * to just change the bit depth and number of channels + */ + for (i = ndlo; i < ndhi; i++) { + wfx.nSamplesPerSec=lpDesc->lpFormat->nSamplesPerSec; + wfx.nChannels = lpDesc->lpFormat->nChannels; + TRY(wfx.nSamplesPerSec, 16); + TRY(wfx.nSamplesPerSec, 8); + wfx.nChannels ^= 3; + TRY(wfx.nSamplesPerSec, 16); + TRY(wfx.nSamplesPerSec, 8); + } + + for (i = ndlo; i < ndhi; i++) { + /* first try with same stereo/mono option as source */ + wfx.nChannels = lpDesc->lpFormat->nChannels; + TRY(96000, 16); + TRY(48000, 16); + TRY(44100, 16); + TRY(22050, 16); + TRY(11025, 16); + + /* 2^3 => 1, 1^3 => 2, so if stereo, try mono (and the other way around) */ + wfx.nChannels ^= 3; + TRY(96000, 16); + TRY(48000, 16); + TRY(44100, 16); + TRY(22050, 16); + TRY(11025, 16); + + /* first try with same stereo/mono option as source */ + wfx.nChannels = lpDesc->lpFormat->nChannels; + TRY(96000, 8); + TRY(48000, 8); + TRY(44100, 8); + TRY(22050, 8); + TRY(11025, 8); + + /* 2^3 => 1, 1^3 => 2, so if stereo, try mono (and the other way around) */ + wfx.nChannels ^= 3; + TRY(96000, 8); + TRY(48000, 8); + TRY(44100, 8); + TRY(22050, 8); + TRY(11025, 8); + } + } +#undef TRY + } + + HeapFree(GetProcessHeap(), 0, wom); + WARN("ret = WAVERR_BADFORMAT\n"); + return WAVERR_BADFORMAT; + +found: + if (dwFlags & WAVE_FORMAT_QUERY) { + *lpdwUser = 0L; + HeapFree(GetProcessHeap(), 0, wom); + } else { + *lpdwUser = (DWORD_PTR)wom; + } + return MMSYSERR_NOERROR; +error: + HeapFree(GetProcessHeap(), 0, wom); + if (res==ACMERR_NOTPOSSIBLE) { + WARN("ret = WAVERR_BADFORMAT\n"); + return WAVERR_BADFORMAT; + } + WARN("ret = 0x%08x\n", res); + return res; +} + +static DWORD wodClose(WAVEMAPDATA* wom) +{ + DWORD ret; + + TRACE("(%p)\n", wom); + + ret = waveOutClose(wom->u.out.hInnerWave); + if (ret == MMSYSERR_NOERROR) { + if (wom->hAcmStream) { + ret = acmStreamClose(wom->hAcmStream, 0); + } + if (ret == MMSYSERR_NOERROR) { + HeapFree(GetProcessHeap(), 0, wom); + } + } + return ret; +} + +static DWORD wodWrite(WAVEMAPDATA* wom, LPWAVEHDR lpWaveHdrSrc, DWORD dwParam2) +{ + PACMSTREAMHEADER ash; + LPWAVEHDR lpWaveHdrDst; + + TRACE("(%p %p %08x)\n", wom, lpWaveHdrSrc, dwParam2); + + if (!wom->hAcmStream) { + return waveOutWrite(wom->u.out.hInnerWave, lpWaveHdrSrc, dwParam2); + } + + lpWaveHdrSrc->dwFlags |= WHDR_INQUEUE; + ash = (PACMSTREAMHEADER)lpWaveHdrSrc->reserved; + /* acmStreamConvert will actually check that the new size is less than initial size */ + ash->cbSrcLength = lpWaveHdrSrc->dwBufferLength; + if (acmStreamConvert(wom->hAcmStream, ash, 0L) != MMSYSERR_NOERROR) { + WARN("acmStreamConvert failed\n"); + return MMSYSERR_ERROR; + } + + lpWaveHdrDst = (LPWAVEHDR)((LPSTR)ash + sizeof(ACMSTREAMHEADER)); + if (ash->cbSrcLength > ash->cbSrcLengthUsed) + FIXME("Not all src buffer has been written, expect bogus sound\n"); + else if (ash->cbSrcLength < ash->cbSrcLengthUsed) + ERR("CoDec has read more data than it is allowed to\n"); + + if (ash->cbDstLengthUsed == 0) { + /* something went wrong in decoding */ + FIXME("Got 0 length\n"); + return MMSYSERR_ERROR; + } + lpWaveHdrDst->dwBufferLength = ash->cbDstLengthUsed; + return waveOutWrite(wom->u.out.hInnerWave, lpWaveHdrDst, sizeof(*lpWaveHdrDst)); +} + +static DWORD wodPrepare(WAVEMAPDATA* wom, LPWAVEHDR lpWaveHdrSrc, DWORD dwParam2) +{ + PACMSTREAMHEADER ash; + DWORD size; + DWORD dwRet; + LPWAVEHDR lpWaveHdrDst; + + TRACE("(%p %p %08x)\n", wom, lpWaveHdrSrc, dwParam2); + + if (!wom->hAcmStream) + return waveOutPrepareHeader(wom->u.out.hInnerWave, lpWaveHdrSrc, dwParam2); + + if (acmStreamSize(wom->hAcmStream, lpWaveHdrSrc->dwBufferLength, &size, ACM_STREAMSIZEF_SOURCE) != MMSYSERR_NOERROR) { + WARN("acmStreamSize failed\n"); + return MMSYSERR_ERROR; + } + + ash = HeapAlloc(GetProcessHeap(), 0, sizeof(ACMSTREAMHEADER) + sizeof(WAVEHDR) + size); + if (ash == NULL) { + WARN("no memory\n"); + return MMSYSERR_NOMEM; + } + + ash->cbStruct = sizeof(*ash); + ash->fdwStatus = 0L; + ash->dwUser = (DWORD_PTR)lpWaveHdrSrc; + ash->pbSrc = (LPBYTE)lpWaveHdrSrc->lpData; + ash->cbSrcLength = lpWaveHdrSrc->dwBufferLength; + /* ash->cbSrcLengthUsed */ + ash->dwSrcUser = lpWaveHdrSrc->dwUser; /* FIXME ? */ + ash->pbDst = (LPBYTE)ash + sizeof(ACMSTREAMHEADER) + sizeof(WAVEHDR); + ash->cbDstLength = size; + /* ash->cbDstLengthUsed */ + ash->dwDstUser = 0; /* FIXME ? */ + dwRet = acmStreamPrepareHeader(wom->hAcmStream, ash, 0L); + if (dwRet != MMSYSERR_NOERROR) { + WARN("acmStreamPrepareHeader failed\n"); + goto errCleanUp; + } + + lpWaveHdrDst = (LPWAVEHDR)((LPSTR)ash + sizeof(ACMSTREAMHEADER)); + lpWaveHdrDst->lpData = (LPSTR)ash->pbDst; + lpWaveHdrDst->dwBufferLength = size; /* conversion is not done yet */ + lpWaveHdrDst->dwFlags = 0; + lpWaveHdrDst->dwLoops = 0; + dwRet = waveOutPrepareHeader(wom->u.out.hInnerWave, lpWaveHdrDst, sizeof(*lpWaveHdrDst)); + if (dwRet != MMSYSERR_NOERROR) { + WARN("waveOutPrepareHeader failed\n"); + goto errCleanUp; + } + + lpWaveHdrSrc->reserved = (DWORD_PTR)ash; + lpWaveHdrSrc->dwFlags = WHDR_PREPARED; + TRACE("=> (0)\n"); + return MMSYSERR_NOERROR; +errCleanUp: + TRACE("=> (%d)\n", dwRet); + HeapFree(GetProcessHeap(), 0, ash); + return dwRet; +} + +static DWORD wodUnprepare(WAVEMAPDATA* wom, LPWAVEHDR lpWaveHdrSrc, DWORD dwParam2) +{ + PACMSTREAMHEADER ash; + LPWAVEHDR lpWaveHdrDst; + DWORD dwRet1, dwRet2; + + TRACE("(%p %p %08x)\n", wom, lpWaveHdrSrc, dwParam2); + + if (!wom->hAcmStream) { + return waveOutUnprepareHeader(wom->u.out.hInnerWave, lpWaveHdrSrc, dwParam2); + } + ash = (PACMSTREAMHEADER)lpWaveHdrSrc->reserved; + dwRet1 = acmStreamUnprepareHeader(wom->hAcmStream, ash, 0L); + + lpWaveHdrDst = (LPWAVEHDR)((LPSTR)ash + sizeof(ACMSTREAMHEADER)); + dwRet2 = waveOutUnprepareHeader(wom->u.out.hInnerWave, lpWaveHdrDst, sizeof(*lpWaveHdrDst)); + + HeapFree(GetProcessHeap(), 0, ash); + + lpWaveHdrSrc->dwFlags &= ~WHDR_PREPARED; + return (dwRet1 == MMSYSERR_NOERROR) ? dwRet2 : dwRet1; +} + +static DWORD wodGetPosition(WAVEMAPDATA* wom, LPMMTIME lpTime, DWORD dwParam2) +{ + DWORD val; + MMTIME timepos; + TRACE("(%p %p %08x)\n", wom, lpTime, dwParam2); + + timepos = *lpTime; + + /* For TIME_MS, we're going to recalculate using TIME_BYTES */ + if (lpTime->wType == TIME_MS) + timepos.wType = TIME_BYTES; + + /* This can change timepos.wType if the requested type is not supported */ + val = waveOutGetPosition(wom->u.out.hInnerWave, &timepos, dwParam2); + + if (timepos.wType == TIME_BYTES) + { + DWORD dwInnerSamplesPerOuter = wom->nSamplesPerSecInner / wom->nSamplesPerSecOuter; + if (dwInnerSamplesPerOuter > 0) + { + DWORD dwInnerBytesPerSample = wom->avgSpeedInner / wom->nSamplesPerSecInner; + DWORD dwInnerBytesPerOuterSample = dwInnerBytesPerSample * dwInnerSamplesPerOuter; + DWORD remainder = 0; + + /* If we are up sampling (going from lower sample rate to higher), + ** we need to make a special accommodation for times when we've + ** written a partial output sample. This happens frequently + ** to us because we use msacm to do our up sampling, and it + ** will up sample on an unaligned basis. + ** For example, if you convert a 2 byte wide 8,000 'outer' + ** buffer to a 2 byte wide 48,000 inner device, you would + ** expect 2 bytes of input to produce 12 bytes of output. + ** Instead, msacm will produce 8 bytes of output. + ** But reporting our position as 1 byte of output is + ** nonsensical; the output buffer position needs to be + ** aligned on outer sample size, and aggressively rounded up. + */ + remainder = timepos.u.cb % dwInnerBytesPerOuterSample; + if (remainder > 0) + { + timepos.u.cb -= remainder; + timepos.u.cb += dwInnerBytesPerOuterSample; + } + } + + lpTime->u.cb = MulDiv(timepos.u.cb, wom->avgSpeedOuter, wom->avgSpeedInner); + + /* Once we have the TIME_BYTES right, we can easily convert to TIME_MS */ + if (lpTime->wType == TIME_MS) + lpTime->u.ms = MulDiv(lpTime->u.cb, 1000, wom->avgSpeedOuter); + else + lpTime->wType = TIME_BYTES; + } + else if (lpTime->wType == TIME_SAMPLES && timepos.wType == TIME_SAMPLES) + lpTime->u.sample = MulDiv(timepos.u.sample, wom->nSamplesPerSecOuter, wom->nSamplesPerSecInner); + else + /* other time types don't require conversion */ + lpTime->u = timepos.u; + + return val; +} + +static DWORD wodGetDevCaps(UINT wDevID, WAVEMAPDATA* wom, LPWAVEOUTCAPSW lpWaveCaps, DWORD dwParam2) +{ + static const WCHAR name[] = {'W','i','n','e',' ','w','a','v','e',' ','o','u','t',' ','m','a','p','p','e','r',0}; + + TRACE("(%04x %p %p %08x)\n",wDevID, wom, lpWaveCaps, dwParam2); + + /* if opened low driver, forward message */ + if (WAVEMAP_IsData(wom)) + return waveOutGetDevCapsW((UINT_PTR)wom->u.out.hInnerWave, lpWaveCaps, dwParam2); + /* else if no drivers, nothing to map so return bad device */ + if (waveOutGetNumDevs() == 0) { + WARN("bad device id\n"); + return MMSYSERR_BADDEVICEID; + } + /* otherwise, return caps of mapper itself */ + if (wDevID == (UINT)-1 || wDevID == (UINT16)-1) { + WAVEOUTCAPSW woc; + woc.wMid = 0x00FF; + woc.wPid = 0x0001; + woc.vDriverVersion = 0x0332; + lstrcpyW(woc.szPname, name); + woc.dwFormats = + WAVE_FORMAT_96M08 | WAVE_FORMAT_96S08 | WAVE_FORMAT_96M16 | WAVE_FORMAT_96S16 | + WAVE_FORMAT_48M08 | WAVE_FORMAT_48S08 | WAVE_FORMAT_48M16 | WAVE_FORMAT_48S16 | + WAVE_FORMAT_4M08 | WAVE_FORMAT_4S08 | WAVE_FORMAT_4M16 | WAVE_FORMAT_4S16 | + WAVE_FORMAT_2M08 | WAVE_FORMAT_2S08 | WAVE_FORMAT_2M16 | WAVE_FORMAT_2S16 | + WAVE_FORMAT_1M08 | WAVE_FORMAT_1S08 | WAVE_FORMAT_1M16 | WAVE_FORMAT_1S16; + woc.wChannels = 2; + woc.dwSupport = WAVECAPS_VOLUME | WAVECAPS_LRVOLUME; + memcpy(lpWaveCaps, &woc, min(dwParam2, sizeof(woc))); + + return MMSYSERR_NOERROR; + } + ERR("This shouldn't happen\n"); + return MMSYSERR_ERROR; +} + +static DWORD wodGetVolume(UINT wDevID, WAVEMAPDATA* wom, LPDWORD lpVol) +{ + TRACE("(%04x %p %p)\n",wDevID, wom, lpVol); + + if (WAVEMAP_IsData(wom)) + return waveOutGetVolume(wom->u.out.hInnerWave, lpVol); + return MMSYSERR_NOERROR; +} + +static DWORD wodSetVolume(UINT wDevID, WAVEMAPDATA* wom, DWORD vol) +{ + TRACE("(%04x %p %08x)\n",wDevID, wom, vol); + + if (WAVEMAP_IsData(wom)) + return waveOutSetVolume(wom->u.out.hInnerWave, vol); + return MMSYSERR_NOERROR; +} + +static DWORD wodPause(WAVEMAPDATA* wom) +{ + TRACE("(%p)\n",wom); + + return waveOutPause(wom->u.out.hInnerWave); +} + +static DWORD wodRestart(WAVEMAPDATA* wom) +{ + TRACE("(%p)\n",wom); + + return waveOutRestart(wom->u.out.hInnerWave); +} + +static DWORD wodReset(WAVEMAPDATA* wom) +{ + TRACE("(%p)\n",wom); + + return waveOutReset(wom->u.out.hInnerWave); +} + +static DWORD wodBreakLoop(WAVEMAPDATA* wom) +{ + TRACE("(%p)\n",wom); + + return waveOutBreakLoop(wom->u.out.hInnerWave); +} + +static DWORD wodMapperStatus(WAVEMAPDATA* wom, DWORD flags, LPVOID ptr) +{ + UINT id; + DWORD ret = MMSYSERR_NOTSUPPORTED; + + TRACE("(%p %08x %p)\n",wom, flags, ptr); + + switch (flags) { + case WAVEOUT_MAPPER_STATUS_DEVICE: + ret = waveOutGetID(wom->u.out.hInnerWave, &id); + *(LPDWORD)ptr = id; + break; + case WAVEOUT_MAPPER_STATUS_MAPPED: + FIXME("Unsupported flag=%d\n", flags); + *(LPDWORD)ptr = 0; /* FIXME ?? */ + break; + case WAVEOUT_MAPPER_STATUS_FORMAT: + FIXME("Unsupported flag=%d\n", flags); + /* ptr points to a WAVEFORMATEX struct - before or after streaming ? */ + *(LPDWORD)ptr = 0; + break; + default: + FIXME("Unsupported flag=%d\n", flags); + *(LPDWORD)ptr = 0; + break; + } + return ret; +} + +static DWORD wodMapperReconfigure(WAVEMAPDATA* wom, DWORD dwParam1, DWORD dwParam2) +{ + FIXME("(%p %08x %08x) stub!\n", wom, dwParam1, dwParam2); + + return MMSYSERR_NOERROR; +} + +/************************************************************************** + * wodMessage (MSACM.@) + */ +DWORD WINAPI WAVEMAP_wodMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, + DWORD_PTR dwParam1, DWORD_PTR dwParam2) +{ + TRACE("(%u, %04X, %08lX, %08lX, %08lX);\n", + wDevID, wMsg, dwUser, dwParam1, dwParam2); + + switch (wMsg) { + case DRVM_INIT: + case DRVM_EXIT: + case DRVM_ENABLE: + case DRVM_DISABLE: + /* FIXME: Pretend this is supported */ + return 0; + case WODM_OPEN: return wodOpen ((DWORD_PTR*)dwUser, (LPWAVEOPENDESC)dwParam1,dwParam2); + case WODM_CLOSE: return wodClose ((WAVEMAPDATA*)dwUser); + case WODM_WRITE: return wodWrite ((WAVEMAPDATA*)dwUser, (LPWAVEHDR)dwParam1, dwParam2); + case WODM_PAUSE: return wodPause ((WAVEMAPDATA*)dwUser); + case WODM_GETPOS: return wodGetPosition ((WAVEMAPDATA*)dwUser, (LPMMTIME)dwParam1, dwParam2); + case WODM_BREAKLOOP: return wodBreakLoop ((WAVEMAPDATA*)dwUser); + case WODM_PREPARE: return wodPrepare ((WAVEMAPDATA*)dwUser, (LPWAVEHDR)dwParam1, dwParam2); + case WODM_UNPREPARE: return wodUnprepare ((WAVEMAPDATA*)dwUser, (LPWAVEHDR)dwParam1, dwParam2); + case WODM_GETDEVCAPS: return wodGetDevCaps (wDevID, (WAVEMAPDATA*)dwUser, (LPWAVEOUTCAPSW)dwParam1,dwParam2); + case WODM_GETNUMDEVS: return 1; + case WODM_GETPITCH: return MMSYSERR_NOTSUPPORTED; + case WODM_SETPITCH: return MMSYSERR_NOTSUPPORTED; + case WODM_GETPLAYBACKRATE: return MMSYSERR_NOTSUPPORTED; + case WODM_SETPLAYBACKRATE: return MMSYSERR_NOTSUPPORTED; + case WODM_GETVOLUME: return wodGetVolume (wDevID, (WAVEMAPDATA*)dwUser, (LPDWORD)dwParam1); + case WODM_SETVOLUME: return wodSetVolume (wDevID, (WAVEMAPDATA*)dwUser, dwParam1); + case WODM_RESTART: return wodRestart ((WAVEMAPDATA*)dwUser); + case WODM_RESET: return wodReset ((WAVEMAPDATA*)dwUser); + case WODM_MAPPER_STATUS: return wodMapperStatus ((WAVEMAPDATA*)dwUser, dwParam1, (LPVOID)dwParam2); + case DRVM_MAPPER_RECONFIGURE: return wodMapperReconfigure((WAVEMAPDATA*)dwUser, dwParam1, dwParam2); + /* known but not supported */ + case DRV_QUERYDEVICEINTERFACESIZE: + case DRV_QUERYDEVICEINTERFACE: + return MMSYSERR_NOTSUPPORTED; + default: + FIXME("unknown message %d!\n", wMsg); + } + return MMSYSERR_NOTSUPPORTED; +} + +/*======================================================================* + * WAVE IN part * + *======================================================================*/ + +static void CALLBACK widCallback(HWAVEIN hWave, UINT uMsg, DWORD_PTR dwInstance, + DWORD_PTR dwParam1, DWORD_PTR dwParam2) +{ + WAVEMAPDATA* wim = (WAVEMAPDATA*)dwInstance; + + TRACE("(%p %u %lx %lx %lx);\n", hWave, uMsg, dwInstance, dwParam1, dwParam2); + + if (!WAVEMAP_IsData(wim)) { + ERR("Bad data\n"); + return; + } + + if (hWave != wim->u.in.hInnerWave && uMsg != WIM_OPEN) + ERR("Shouldn't happen (%p %p)\n", hWave, wim->u.in.hInnerWave); + + switch (uMsg) { + case WIM_OPEN: + case WIM_CLOSE: + /* dwParam1 & dwParam2 are supposed to be 0, nothing to do */ + break; + case WIM_DATA: + if (wim->hAcmStream) { + LPWAVEHDR lpWaveHdrSrc = (LPWAVEHDR)dwParam1; + PACMSTREAMHEADER ash = (PACMSTREAMHEADER)((LPSTR)lpWaveHdrSrc - sizeof(ACMSTREAMHEADER)); + LPWAVEHDR lpWaveHdrDst = (LPWAVEHDR)ash->dwUser; + + /* convert data just gotten from waveIn into requested format */ + if (acmStreamConvert(wim->hAcmStream, ash, 0L) != MMSYSERR_NOERROR) { + ERR("ACM conversion failed\n"); + return; + } else { + TRACE("Converted %d bytes into %d\n", ash->cbSrcLengthUsed, ash->cbDstLengthUsed); + } + /* and setup the wavehdr to return accordingly */ + lpWaveHdrDst->dwFlags &= ~WHDR_INQUEUE; + lpWaveHdrDst->dwFlags |= WHDR_DONE; + lpWaveHdrDst->dwBytesRecorded = ash->cbDstLengthUsed; + dwParam1 = (DWORD_PTR)lpWaveHdrDst; + } + break; + default: + ERR("Unknown msg %u\n", uMsg); + } + + DriverCallback(wim->dwCallback, HIWORD(wim->dwFlags), (HDRVR)wim->u.in.hOuterWave, + uMsg, wim->dwClientInstance, dwParam1, dwParam2); +} + +static DWORD widOpenHelper(WAVEMAPDATA* wim, UINT idx, + LPWAVEOPENDESC lpDesc, LPWAVEFORMATEX lpwfx, + DWORD dwFlags) +{ + DWORD ret; + + TRACE("(%p %04x %p %p %08x)\n", wim, idx, lpDesc, lpwfx, dwFlags); + + /* source is always PCM, so the formulas below apply */ + lpwfx->nBlockAlign = (lpwfx->nChannels * lpwfx->wBitsPerSample) / 8; + lpwfx->nAvgBytesPerSec = lpwfx->nSamplesPerSec * lpwfx->nBlockAlign; + if (dwFlags & WAVE_FORMAT_QUERY) { + ret = acmStreamOpen(NULL, 0, lpwfx, lpDesc->lpFormat, NULL, 0L, 0L, ACM_STREAMOPENF_QUERY); + } else { + ret = acmStreamOpen(&wim->hAcmStream, 0, lpwfx, lpDesc->lpFormat, NULL, 0L, 0L, 0L); + } + if (ret == MMSYSERR_NOERROR) { + ret = waveInOpen(&wim->u.in.hInnerWave, idx, lpwfx, + (DWORD_PTR)widCallback, (DWORD_PTR)wim, + (dwFlags & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION); + if (ret != MMSYSERR_NOERROR && !(dwFlags & WAVE_FORMAT_QUERY)) { + acmStreamClose(wim->hAcmStream, 0); + wim->hAcmStream = 0; + } + } + TRACE("ret = %08x\n", ret); + return ret; +} + +static DWORD widOpen(DWORD_PTR *lpdwUser, LPWAVEOPENDESC lpDesc, DWORD dwFlags) +{ + UINT ndlo, ndhi; + UINT i; + WAVEMAPDATA* wim = HeapAlloc(GetProcessHeap(), 0, sizeof(WAVEMAPDATA)); + DWORD res; + + TRACE("(%p %p %08x)\n", lpdwUser, lpDesc, dwFlags); + + if (!wim) { + WARN("no memory\n"); + return MMSYSERR_NOMEM; + } + + wim->self = wim; + wim->dwCallback = lpDesc->dwCallback; + wim->dwFlags = dwFlags; + wim->dwClientInstance = lpDesc->dwInstance; + wim->u.in.hOuterWave = (HWAVEIN)lpDesc->hWave; + + ndhi = waveInGetNumDevs(); + if (dwFlags & WAVE_MAPPED) { + if (lpDesc->uMappedDeviceID >= ndhi) return MMSYSERR_INVALPARAM; + ndlo = lpDesc->uMappedDeviceID; + ndhi = ndlo + 1; + dwFlags &= ~WAVE_MAPPED; + } else { + ndlo = 0; + } + + wim->avgSpeedOuter = wim->avgSpeedInner = lpDesc->lpFormat->nAvgBytesPerSec; + wim->nSamplesPerSecOuter = wim->nSamplesPerSecInner = lpDesc->lpFormat->nSamplesPerSec; + + for (i = ndlo; i < ndhi; i++) { + if (waveInOpen(&wim->u.in.hInnerWave, i, lpDesc->lpFormat, + (DWORD_PTR)widCallback, (DWORD_PTR)wim, + (dwFlags & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION | WAVE_FORMAT_DIRECT) == MMSYSERR_NOERROR) { + wim->hAcmStream = 0; + goto found; + } + } + + if ((dwFlags & WAVE_FORMAT_DIRECT) == 0) + { + WAVEFORMATEX wfx; + + wfx.wFormatTag = WAVE_FORMAT_PCM; + wfx.cbSize = 0; /* normally, this field is not used for PCM format, just in case */ + /* try some ACM stuff */ + +#define TRY(sps,bps) wfx.nSamplesPerSec = (sps); wfx.wBitsPerSample = (bps); \ + switch (res=widOpenHelper(wim, i, lpDesc, &wfx, dwFlags | WAVE_FORMAT_DIRECT)) { \ + case MMSYSERR_NOERROR: wim->avgSpeedInner = wfx.nAvgBytesPerSec; wim->nSamplesPerSecInner = wfx.nSamplesPerSec; goto found; \ + case WAVERR_BADFORMAT: break; \ + default: goto error; \ + } + + for (i = ndlo; i < ndhi; i++) { + wfx.nSamplesPerSec=lpDesc->lpFormat->nSamplesPerSec; + /* first try with same stereo/mono option as source */ + wfx.nChannels = lpDesc->lpFormat->nChannels; + TRY(wfx.nSamplesPerSec, 16); + TRY(wfx.nSamplesPerSec, 8); + wfx.nChannels ^= 3; + TRY(wfx.nSamplesPerSec, 16); + TRY(wfx.nSamplesPerSec, 8); + } + + for (i = ndlo; i < ndhi; i++) { + wfx.nSamplesPerSec=lpDesc->lpFormat->nSamplesPerSec; + /* first try with same stereo/mono option as source */ + wfx.nChannels = lpDesc->lpFormat->nChannels; + TRY(96000, 16); + TRY(48000, 16); + TRY(44100, 16); + TRY(22050, 16); + TRY(11025, 16); + + /* 2^3 => 1, 1^3 => 2, so if stereo, try mono (and the other way around) */ + wfx.nChannels ^= 3; + TRY(96000, 16); + TRY(48000, 16); + TRY(44100, 16); + TRY(22050, 16); + TRY(11025, 16); + + /* first try with same stereo/mono option as source */ + wfx.nChannels = lpDesc->lpFormat->nChannels; + TRY(96000, 8); + TRY(48000, 8); + TRY(44100, 8); + TRY(22050, 8); + TRY(11025, 8); + + /* 2^3 => 1, 1^3 => 2, so if stereo, try mono (and the other way around) */ + wfx.nChannels ^= 3; + TRY(96000, 8); + TRY(48000, 8); + TRY(44100, 8); + TRY(22050, 8); + TRY(11025, 8); + } +#undef TRY + } + + HeapFree(GetProcessHeap(), 0, wim); + WARN("ret = WAVERR_BADFORMAT\n"); + return WAVERR_BADFORMAT; +found: + if (dwFlags & WAVE_FORMAT_QUERY) { + *lpdwUser = 0L; + HeapFree(GetProcessHeap(), 0, wim); + } else { + *lpdwUser = (DWORD_PTR)wim; + } + TRACE("Ok (stream=%p)\n", wim->hAcmStream); + return MMSYSERR_NOERROR; +error: + HeapFree(GetProcessHeap(), 0, wim); + if (res==ACMERR_NOTPOSSIBLE) { + WARN("ret = WAVERR_BADFORMAT\n"); + return WAVERR_BADFORMAT; + } + WARN("ret = 0x%08x\n", res); + return res; +} + +static DWORD widClose(WAVEMAPDATA* wim) +{ + DWORD ret; + + TRACE("(%p)\n", wim); + + ret = waveInClose(wim->u.in.hInnerWave); + if (ret == MMSYSERR_NOERROR) { + if (wim->hAcmStream) { + ret = acmStreamClose(wim->hAcmStream, 0); + } + if (ret == MMSYSERR_NOERROR) { + HeapFree(GetProcessHeap(), 0, wim); + } + } + return ret; +} + +static DWORD widAddBuffer(WAVEMAPDATA* wim, LPWAVEHDR lpWaveHdrDst, DWORD dwParam2) +{ + PACMSTREAMHEADER ash; + LPWAVEHDR lpWaveHdrSrc; + + TRACE("(%p %p %08x)\n", wim, lpWaveHdrDst, dwParam2); + + if (!wim->hAcmStream) { + return waveInAddBuffer(wim->u.in.hInnerWave, lpWaveHdrDst, dwParam2); + } + + lpWaveHdrDst->dwFlags |= WHDR_INQUEUE; + ash = (PACMSTREAMHEADER)lpWaveHdrDst->reserved; + + lpWaveHdrSrc = (LPWAVEHDR)((LPSTR)ash + sizeof(ACMSTREAMHEADER)); + return waveInAddBuffer(wim->u.in.hInnerWave, lpWaveHdrSrc, sizeof(*lpWaveHdrSrc)); +} + +static DWORD widPrepare(WAVEMAPDATA* wim, LPWAVEHDR lpWaveHdrDst, DWORD dwParam2) +{ + PACMSTREAMHEADER ash; + DWORD size; + DWORD dwRet; + LPWAVEHDR lpWaveHdrSrc; + + TRACE("(%p %p %08x)\n", wim, lpWaveHdrDst, dwParam2); + + if (!wim->hAcmStream) { + return waveInPrepareHeader(wim->u.in.hInnerWave, lpWaveHdrDst, dwParam2); + } + if (acmStreamSize(wim->hAcmStream, lpWaveHdrDst->dwBufferLength, &size, + ACM_STREAMSIZEF_DESTINATION) != MMSYSERR_NOERROR) { + WARN("acmStreamSize failed\n"); + return MMSYSERR_ERROR; + } + + ash = HeapAlloc(GetProcessHeap(), 0, sizeof(ACMSTREAMHEADER) + sizeof(WAVEHDR) + size); + if (ash == NULL) { + WARN("no memory\n"); + return MMSYSERR_NOMEM; + } + + ash->cbStruct = sizeof(*ash); + ash->fdwStatus = 0L; + ash->dwUser = (DWORD_PTR)lpWaveHdrDst; + ash->pbSrc = (LPBYTE)ash + sizeof(ACMSTREAMHEADER) + sizeof(WAVEHDR); + ash->cbSrcLength = size; + /* ash->cbSrcLengthUsed */ + ash->dwSrcUser = 0L; /* FIXME ? */ + ash->pbDst = (LPBYTE)lpWaveHdrDst->lpData; + ash->cbDstLength = lpWaveHdrDst->dwBufferLength; + /* ash->cbDstLengthUsed */ + ash->dwDstUser = lpWaveHdrDst->dwUser; /* FIXME ? */ + dwRet = acmStreamPrepareHeader(wim->hAcmStream, ash, 0L); + if (dwRet != MMSYSERR_NOERROR) { + WARN("acmStreamPrepareHeader failed\n"); + goto errCleanUp; + } + + lpWaveHdrSrc = (LPWAVEHDR)((LPSTR)ash + sizeof(ACMSTREAMHEADER)); + lpWaveHdrSrc->lpData = (LPSTR)ash->pbSrc; + lpWaveHdrSrc->dwBufferLength = size; /* conversion is not done yet */ + lpWaveHdrSrc->dwFlags = 0; + lpWaveHdrSrc->dwLoops = 0; + dwRet = waveInPrepareHeader(wim->u.in.hInnerWave, lpWaveHdrSrc, sizeof(*lpWaveHdrSrc)); + if (dwRet != MMSYSERR_NOERROR) { + WARN("waveInPrepareHeader failed\n"); + goto errCleanUp; + } + + lpWaveHdrDst->reserved = (DWORD_PTR)ash; + lpWaveHdrDst->dwFlags = WHDR_PREPARED; + TRACE("=> (0)\n"); + return MMSYSERR_NOERROR; +errCleanUp: + TRACE("=> (%d)\n", dwRet); + HeapFree(GetProcessHeap(), 0, ash); + return dwRet; +} + +static DWORD widUnprepare(WAVEMAPDATA* wim, LPWAVEHDR lpWaveHdrDst, DWORD dwParam2) +{ + PACMSTREAMHEADER ash; + LPWAVEHDR lpWaveHdrSrc; + DWORD dwRet1, dwRet2; + + TRACE("(%p %p %08x)\n", wim, lpWaveHdrDst, dwParam2); + + if (!wim->hAcmStream) { + return waveInUnprepareHeader(wim->u.in.hInnerWave, lpWaveHdrDst, dwParam2); + } + ash = (PACMSTREAMHEADER)lpWaveHdrDst->reserved; + dwRet1 = acmStreamUnprepareHeader(wim->hAcmStream, ash, 0L); + + lpWaveHdrSrc = (LPWAVEHDR)((LPSTR)ash + sizeof(ACMSTREAMHEADER)); + dwRet2 = waveInUnprepareHeader(wim->u.in.hInnerWave, lpWaveHdrSrc, sizeof(*lpWaveHdrSrc)); + + HeapFree(GetProcessHeap(), 0, ash); + + lpWaveHdrDst->dwFlags &= ~WHDR_PREPARED; + return (dwRet1 == MMSYSERR_NOERROR) ? dwRet2 : dwRet1; +} + +static DWORD widGetPosition(WAVEMAPDATA* wim, LPMMTIME lpTime, DWORD dwParam2) +{ + DWORD val; + MMTIME timepos; + TRACE("(%p %p %08x)\n", wim, lpTime, dwParam2); + + timepos = *lpTime; + + /* For TIME_MS, we're going to recalculate using TIME_BYTES */ + if (lpTime->wType == TIME_MS) + timepos.wType = TIME_BYTES; + + /* This can change timepos.wType if the requested type is not supported */ + val = waveInGetPosition(wim->u.in.hInnerWave, &timepos, dwParam2); + + if (timepos.wType == TIME_BYTES) + { + DWORD dwInnerSamplesPerOuter = wim->nSamplesPerSecInner / wim->nSamplesPerSecOuter; + if (dwInnerSamplesPerOuter > 0) + { + DWORD dwInnerBytesPerSample = wim->avgSpeedInner / wim->nSamplesPerSecInner; + DWORD dwInnerBytesPerOuterSample = dwInnerBytesPerSample * dwInnerSamplesPerOuter; + DWORD remainder = 0; + + /* If we are up sampling (going from lower sample rate to higher), + ** we need to make a special accommodation for times when we've + ** written a partial output sample. This happens frequently + ** to us because we use msacm to do our up sampling, and it + ** will up sample on an unaligned basis. + ** For example, if you convert a 2 byte wide 8,000 'outer' + ** buffer to a 2 byte wide 48,000 inner device, you would + ** expect 2 bytes of input to produce 12 bytes of output. + ** Instead, msacm will produce 8 bytes of output. + ** But reporting our position as 1 byte of output is + ** nonsensical; the output buffer position needs to be + ** aligned on outer sample size, and aggressively rounded up. + */ + remainder = timepos.u.cb % dwInnerBytesPerOuterSample; + if (remainder > 0) + { + timepos.u.cb -= remainder; + timepos.u.cb += dwInnerBytesPerOuterSample; + } + } + + lpTime->u.cb = MulDiv(timepos.u.cb, wim->avgSpeedOuter, wim->avgSpeedInner); + + /* Once we have the TIME_BYTES right, we can easily convert to TIME_MS */ + if (lpTime->wType == TIME_MS) + lpTime->u.ms = MulDiv(lpTime->u.cb, 1000, wim->avgSpeedOuter); + else + lpTime->wType = TIME_BYTES; + } + else if (lpTime->wType == TIME_SAMPLES && timepos.wType == TIME_SAMPLES) + lpTime->u.sample = MulDiv(timepos.u.sample, wim->nSamplesPerSecOuter, wim->nSamplesPerSecInner); + else + /* other time types don't require conversion */ + lpTime->u = timepos.u; + + return val; +} + +static DWORD widGetDevCaps(UINT wDevID, WAVEMAPDATA* wim, LPWAVEINCAPSW lpWaveCaps, DWORD dwParam2) +{ + TRACE("(%04x, %p %p %08x)\n", wDevID, wim, lpWaveCaps, dwParam2); + + /* if opened low driver, forward message */ + if (WAVEMAP_IsData(wim)) + return waveInGetDevCapsW((UINT_PTR)wim->u.in.hInnerWave, lpWaveCaps, dwParam2); + /* else if no drivers, nothing to map so return bad device */ + if (waveInGetNumDevs() == 0) { + WARN("bad device id\n"); + return MMSYSERR_BADDEVICEID; + } + /* otherwise, return caps of mapper itself */ + if (wDevID == (UINT)-1 || wDevID == (UINT16)-1) { + WAVEINCAPSW wic; + static const WCHAR init[] = {'W','i','n','e',' ','w','a','v','e',' ','i','n',' ','m','a','p','p','e','r',0}; + wic.wMid = 0x00FF; + wic.wPid = 0x0001; + wic.vDriverVersion = 0x0001; + strcpyW(wic.szPname, init); + wic.dwFormats = + WAVE_FORMAT_96M08 | WAVE_FORMAT_96S08 | WAVE_FORMAT_96M16 | WAVE_FORMAT_96S16 | + WAVE_FORMAT_48M08 | WAVE_FORMAT_48S08 | WAVE_FORMAT_48M16 | WAVE_FORMAT_48S16 | + WAVE_FORMAT_4M08 | WAVE_FORMAT_4S08 | WAVE_FORMAT_4M16 | WAVE_FORMAT_4S16 | + WAVE_FORMAT_2M08 | WAVE_FORMAT_2S08 | WAVE_FORMAT_2M16 | WAVE_FORMAT_2S16 | + WAVE_FORMAT_1M08 | WAVE_FORMAT_1S08 | WAVE_FORMAT_1M16 | WAVE_FORMAT_1S16; + wic.wChannels = 2; + memcpy(lpWaveCaps, &wic, min(dwParam2, sizeof(wic))); + + return MMSYSERR_NOERROR; + } + ERR("This shouldn't happen\n"); + return MMSYSERR_ERROR; +} + +static DWORD widStop(WAVEMAPDATA* wim) +{ + TRACE("(%p)\n", wim); + + return waveInStop(wim->u.in.hInnerWave); +} + +static DWORD widStart(WAVEMAPDATA* wim) +{ + TRACE("(%p)\n", wim); + + return waveInStart(wim->u.in.hInnerWave); +} + +static DWORD widReset(WAVEMAPDATA* wim) +{ + TRACE("(%p)\n", wim); + + return waveInReset(wim->u.in.hInnerWave); +} + +static DWORD widMapperStatus(WAVEMAPDATA* wim, DWORD flags, LPVOID ptr) +{ + UINT id; + DWORD ret = MMSYSERR_NOTSUPPORTED; + + TRACE("(%p %08x %p)\n", wim, flags, ptr); + + switch (flags) { + case WAVEIN_MAPPER_STATUS_DEVICE: + ret = waveInGetID(wim->u.in.hInnerWave, &id); + *(LPDWORD)ptr = id; + break; + case WAVEIN_MAPPER_STATUS_MAPPED: + FIXME("Unsupported yet flag=%d\n", flags); + *(LPDWORD)ptr = 0; /* FIXME ?? */ + break; + case WAVEIN_MAPPER_STATUS_FORMAT: + FIXME("Unsupported flag=%d\n", flags); + /* ptr points to a WAVEFORMATEX struct - before or after streaming ? */ + *(LPDWORD)ptr = 0; /* FIXME ?? */ + break; + default: + FIXME("Unsupported flag=%d\n", flags); + *(LPDWORD)ptr = 0; + break; + } + return ret; +} + +static DWORD widMapperReconfigure(WAVEMAPDATA* wim, DWORD dwParam1, DWORD dwParam2) +{ + FIXME("(%p %08x %08x) stub!\n", wim, dwParam1, dwParam2); + + return MMSYSERR_NOERROR; +} + +/************************************************************************** + * widMessage (MSACM.@) + */ +DWORD WINAPI WAVEMAP_widMessage(WORD wDevID, WORD wMsg, DWORD_PTR dwUser, + DWORD_PTR dwParam1, DWORD_PTR dwParam2) +{ + TRACE("(%u, %04X, %08lX, %08lX, %08lX);\n", + wDevID, wMsg, dwUser, dwParam1, dwParam2); + + switch (wMsg) { + case DRVM_INIT: + case DRVM_EXIT: + case DRVM_ENABLE: + case DRVM_DISABLE: + /* FIXME: Pretend this is supported */ + return 0; + + case WIDM_OPEN: return widOpen ((DWORD_PTR*)dwUser, (LPWAVEOPENDESC)dwParam1, dwParam2); + case WIDM_CLOSE: return widClose ((WAVEMAPDATA*)dwUser); + + case WIDM_ADDBUFFER: return widAddBuffer ((WAVEMAPDATA*)dwUser, (LPWAVEHDR)dwParam1, dwParam2); + case WIDM_PREPARE: return widPrepare ((WAVEMAPDATA*)dwUser, (LPWAVEHDR)dwParam1, dwParam2); + case WIDM_UNPREPARE: return widUnprepare ((WAVEMAPDATA*)dwUser, (LPWAVEHDR)dwParam1, dwParam2); + case WIDM_GETDEVCAPS: return widGetDevCaps (wDevID, (WAVEMAPDATA*)dwUser, (LPWAVEINCAPSW)dwParam1, dwParam2); + case WIDM_GETNUMDEVS: return 1; + case WIDM_GETPOS: return widGetPosition ((WAVEMAPDATA*)dwUser, (LPMMTIME)dwParam1, dwParam2); + case WIDM_RESET: return widReset ((WAVEMAPDATA*)dwUser); + case WIDM_START: return widStart ((WAVEMAPDATA*)dwUser); + case WIDM_STOP: return widStop ((WAVEMAPDATA*)dwUser); + case WIDM_MAPPER_STATUS: return widMapperStatus ((WAVEMAPDATA*)dwUser, dwParam1, (LPVOID)dwParam2); + case DRVM_MAPPER_RECONFIGURE: return widMapperReconfigure((WAVEMAPDATA*)dwUser, dwParam1, dwParam2); + /* known but not supported */ + case DRV_QUERYDEVICEINTERFACESIZE: + case DRV_QUERYDEVICEINTERFACE: + return MMSYSERR_NOTSUPPORTED; + default: + FIXME("unknown message %u!\n", wMsg); + } + return MMSYSERR_NOTSUPPORTED; +} + +/*======================================================================* + * Driver part * + *======================================================================*/ + +static struct WINE_WAVEMAP* oss = NULL; + +/************************************************************************** + * WAVEMAP_drvOpen [internal] + */ +static LRESULT WAVEMAP_drvOpen(LPSTR str) +{ + TRACE("(%p)\n", str); + + if (oss) + return 0; + + /* I know, this is ugly, but who cares... */ + oss = (struct WINE_WAVEMAP*)1; + return 1; +} + +/************************************************************************** + * WAVEMAP_drvClose [internal] + */ +static LRESULT WAVEMAP_drvClose(DWORD_PTR dwDevID) +{ + TRACE("(%08lx)\n", dwDevID); + + if (oss) { + oss = NULL; + return 1; + } + return 0; +} + +/************************************************************************** + * DriverProc (MSACM.@) + */ +LRESULT CALLBACK WAVEMAP_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, + LPARAM dwParam1, LPARAM dwParam2) +{ + TRACE("(%08lX, %p, %08X, %08lX, %08lX)\n", + dwDevID, hDriv, wMsg, dwParam1, dwParam2); + + switch(wMsg) { + case DRV_LOAD: return 1; + case DRV_FREE: return 1; + case DRV_OPEN: return WAVEMAP_drvOpen((LPSTR)dwParam1); + case DRV_CLOSE: return WAVEMAP_drvClose(dwDevID); + case DRV_ENABLE: return 1; + case DRV_DISABLE: return 1; + case DRV_QUERYCONFIGURE: return 1; + case DRV_CONFIGURE: MessageBoxA(0, "WAVEMAP MultiMedia Driver !", "Wave mapper Driver", MB_OK); return 1; + case DRV_INSTALL: return DRVCNF_RESTART; + case DRV_REMOVE: return DRVCNF_RESTART; + default: + return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); + } +} Propchange: trunk/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/msacm32/msacm32.drv/wavemap.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm32.… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm32.drv/wavemap.rc (added) +++ trunk/reactos/dll/win32/msacm32/msacm32.drv/wavemap.rc [iso-8859-1] Tue May 26 02:38:00 2009 @@ -1,0 +1,7 @@ +/* $Id: wavemap.rc 11297 2004-10-16 20:27:43Z gvg $ */ + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS/WINE Wave Mapper\0" +#define REACTOS_STR_INTERNAL_NAME "wavemap\0" +#define REACTOS_STR_ORIGINAL_FILENAME "wavemap.drv\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/win32/msacm32/msacm32.drv/wavemap.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msacm32/msacm32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm32.… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm32.rbuild [iso-8859-1] Tue May 26 02:38:00 2009 @@ -16,3 +16,6 @@ <file>pcmconverter.c</file> <file>stream.c</file> </module> +<directory name="msacm32.drv"> + <xi:include href="msacm32.drv/msacm32.drv.rbuild" /> +</directory> Modified: trunk/reactos/dll/win32/winmm/winmm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm.rbui… ============================================================================== --- trunk/reactos/dll/win32/winmm/winmm.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/winmm.rbuild [iso-8859-1] Tue May 26 02:38:00 2009 @@ -3,9 +3,6 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <directory name="midimap"> <xi:include href="midimap/midimap.rbuild" /> -</directory> -<directory name="wavemap"> - <xi:include href="wavemap/wavemap.rbuild" /> </directory> <module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}" installbase="system32" installname="winmm.dll" crt="msvcrt"> <importlibrary definition="winmm.spec" />

1 0

[dreimer] 41120: ByeBye MinGW.ico
by dreimer＠svn.reactos.org 25 May '09

25 May '09

Author: dreimer Date: Mon May 25 20:20:35 2009 New Revision: 41120 URL: http://svn.reactos.org/svn/reactos?rev=41120&view=rev Log: ByeBye MinGW.ico Removed: trunk/tools/RosBE/RosBE-Windows/Icons/mingw.ico Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Removed: trunk/tools/RosBE/RosBE-Windows/Icons/mingw.ico URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Icons/mi… ============================================================================== Binary file - no diff available. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Mon May 25 20:20:35 2009 @@ -114,7 +114,6 @@ SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try - File /r Icons\mingw.ico File /r Icons\rosbe.ico File /r Root\README.pdf File /r Root\changelog.txt @@ -482,7 +481,6 @@ Delete /REBOOTOK "$INSTDIR\update.ps1" Delete /REBOOTOK "$INSTDIR\README.pdf" Delete /REBOOTOK "$INSTDIR\rosbe.ico" - Delete /REBOOTOK "$INSTDIR\mingw.ico" Delete /REBOOTOK "$INSTDIR\uninstall.ico" Delete /REBOOTOK "$INSTDIR\RosBE.mac" Delete /REBOOTOK "$INSTDIR\ChangeLog.txt"

1 0

[mjmartin] 41119: - i8042MouInternalDeviceControl: Implement IoControlCode of IOCTL_INTERNAL_I8042_HOOK_MOUSE. - ForwardIrpAndWait: Don't use IoForwardIrpSynchronously to Forward IRPs as it fails if no next stack location is available, which prevents the mouse from initializing. Changed it to match implementation of our other input drivers. Mouse pointer now works with VBoxMouse driver loaded.
by mjmartin＠svn.reactos.org 25 May '09

25 May '09

Author: mjmartin Date: Mon May 25 20:15:33 2009 New Revision: 41119 URL: http://svn.reactos.org/svn/reactos?rev=41119&view=rev Log: - i8042MouInternalDeviceControl: Implement IoControlCode of IOCTL_INTERNAL_I8042_HOOK_MOUSE. - ForwardIrpAndWait: Don't use IoForwardIrpSynchronously to Forward IRPs as it fails if no next stack location is available, which prevents the mouse from initializing. Changed it to match implementation of our other input drivers. Mouse pointer now works with VBoxMouse driver loaded. Modified: trunk/reactos/drivers/input/i8042prt/misc.c trunk/reactos/drivers/input/i8042prt/mouse.c Modified: trunk/reactos/drivers/input/i8042prt/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/mis… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/misc.c [iso-8859-1] Mon May 25 20:15:33 2009 @@ -11,20 +11,43 @@ #include "i8042prt.h" /* FUNCTIONS *****************************************************************/ +static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion; + +static NTSTATUS NTAPI +ForwardIrpAndWaitCompletion( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + if (Irp->PendingReturned) + KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); + return STATUS_MORE_PROCESSING_REQUIRED; +} NTSTATUS NTAPI ForwardIrpAndWait( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + KEVENT Event; + NTSTATUS Status; PDEVICE_OBJECT LowerDevice = ((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; - ASSERT(LowerDevice); - if (!IoForwardIrpSynchronously(LowerDevice, Irp)) - return STATUS_UNSUCCESSFUL; + KeInitializeEvent(&Event, NotificationEvent, FALSE); + IoCopyCurrentIrpStackLocationToNext(Irp); - return Irp->IoStatus.Status; + IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); + + Status = IoCallDriver(LowerDevice, Irp); + if (Status == STATUS_PENDING) + { + Status = KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + if (NT_SUCCESS(Status)) + Status = Irp->IoStatus.Status; + } + + return Status; } NTSTATUS NTAPI Modified: trunk/reactos/drivers/input/i8042prt/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/mou… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/mouse.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/mouse.c [iso-8859-1] Mon May 25 20:15:33 2009 @@ -482,8 +482,19 @@ } case IOCTL_INTERNAL_I8042_HOOK_MOUSE: { + PINTERNAL_I8042_HOOK_MOUSE MouseHook; TRACE_(I8042PRT, "IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_INTERNAL_I8042_HOOK_MOUSE\n"); - /* Nothing to do here */ + if (Stack->Parameters.DeviceIoControl.InputBufferLength < sizeof(CONNECT_DATA)) + { + Status = STATUS_INVALID_PARAMETER; + break; + } + MouseHook = (PINTERNAL_I8042_HOOK_MOUSE)Stack->Parameters.DeviceIoControl.Type3InputBuffer; + + DeviceExtension->MouseHook.Context = MouseHook->Context; + if (MouseHook->IsrRoutine) + DeviceExtension->MouseHook.IsrRoutine = MouseHook->IsrRoutine; + Status = STATUS_SUCCESS; break; }

1 0

[khornicek] 41118: - dls1.h, dmdls.h, dmusics.h: fix typos, add missing definitions - import dmerror.h, dmplugin.h, dmusicc.h, dmusicf.h, dmusici.h from Wine
by khornicek＠svn.reactos.org 25 May '09

25 May '09

Author: khornicek Date: Mon May 25 18:49:04 2009 New Revision: 41118 URL: http://svn.reactos.org/svn/reactos?rev=41118&view=rev Log: - dls1.h, dmdls.h, dmusics.h: fix typos, add missing definitions - import dmerror.h, dmplugin.h, dmusicc.h, dmusicf.h, dmusici.h from Wine Added: trunk/reactos/include/dxsdk/dmerror.h (with props) trunk/reactos/include/dxsdk/dmplugin.h (with props) trunk/reactos/include/dxsdk/dmusicc.h (with props) trunk/reactos/include/dxsdk/dmusicf.h (with props) trunk/reactos/include/dxsdk/dmusici.h (with props) Modified: trunk/reactos/include/dxsdk/dls1.h trunk/reactos/include/dxsdk/dmdls.h trunk/reactos/include/dxsdk/dmusics.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/dxsdk/dls1.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dls1.h?rev=4… Modified: trunk/reactos/include/dxsdk/dmdls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dmdls.h?rev=… Added: trunk/reactos/include/dxsdk/dmerror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dmerror.h?re… Added: trunk/reactos/include/dxsdk/dmplugin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dmplugin.h?r… Added: trunk/reactos/include/dxsdk/dmusicc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dmusicc.h?re… Added: trunk/reactos/include/dxsdk/dmusicf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dmusicf.h?re… Added: trunk/reactos/include/dxsdk/dmusici.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dmusici.h?re… Modified: trunk/reactos/include/dxsdk/dmusics.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dmusics.h?re…

1 0

[dchapyshev] 41117: - Add missed DnsFree
by dchapyshev＠svn.reactos.org 25 May '09

25 May '09

Author: dchapyshev Date: Mon May 25 17:17:32 2009 New Revision: 41117 URL: http://svn.reactos.org/svn/reactos?rev=41117&view=rev Log: - Add missed DnsFree Modified: trunk/reactos/dll/win32/dnsapi/dnsapi.spec Modified: trunk/reactos/dll/win32/dnsapi/dnsapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi.sp… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi.spec [iso-8859-1] Mon May 25 17:17:32 2009 @@ -127,3 +127,4 @@ @ stdcall DnsWriteQuestionToBuffer_W(ptr ptr wstr long long long) @ stub DnsWriteReverseNameStringForIpAddress @ stub GetCurrentTimeInSeconds +@ stdcall DnsFree(ptr long)

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2009