Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[hpoussin] 29639: Implement ProfileItems support in .inf files See issue #2738 for more details.
by hpoussin＠svn.reactos.org 17 Oct '07

17 Oct '07

Author: hpoussin Date: Wed Oct 17 17:43:40 2007 New Revision: 29639 URL: http://svn.reactos.org/svn/reactos?rev=29639&view=rev Log: Implement ProfileItems support in .inf files See issue #2738 for more details. Modified: trunk/reactos/dll/win32/setupapi/install.c trunk/reactos/dll/win32/setupapi/setupapi_private.h Modified: trunk/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/install… ============================================================================== --- trunk/reactos/dll/win32/setupapi/install.c (original) +++ trunk/reactos/dll/win32/setupapi/install.c Wed Oct 17 17:43:40 2007 @@ -40,6 +40,16 @@ static const WCHAR ServiceTypeKey[] = {'S','e','r','v','i','c','e','T','y','p','e',0}; static const WCHAR StartTypeKey[] = {'S','t','a','r','t','T','y','p','e',0}; +static const WCHAR Name[] = {'N','a','m','e',0}; +static const WCHAR CmdLine[] = {'C','m','d','L','i','n','e',0}; +static const WCHAR SubDir[] = {'S','u','b','D','i','r',0}; +static const WCHAR WorkingDir[] = {'W','o','r','k','i','n','g','D','i','r',0}; +static const WCHAR IconPath[] = {'I','c','o','n','P','a','t','h',0}; +static const WCHAR IconIndex[] = {'I','c','o','n','I','n','d','e','x',0}; +static const WCHAR HotKey[] = {'H','o','t','K','e','y',0}; +static const WCHAR InfoTip[] = {'I','n','f','o','T','i','p',0}; +static const WCHAR DisplayResource[] = {'D','i','s','p','l','a','y','R','e','s','o','u','r','c','e',0}; + /* info passed to callback functions dealing with files */ struct files_callback_info { @@ -83,6 +93,10 @@ }; typedef BOOL (*iterate_fields_func)( HINF hinf, PCWSTR field, void *arg ); +static BOOL GetLineText( HINF hinf, PCWSTR section_name, PCWSTR key_name, PWSTR *value); +typedef HRESULT WINAPI (*COINITIALIZE)(IN LPVOID pvReserved); +typedef HRESULT WINAPI (*COCREATEINSTANCE)(IN REFCLSID rclsid, IN LPUNKNOWN pUnkOuter, IN DWORD dwClsContext, IN REFIID riid, OUT LPVOID *ppv); +typedef HRESULT WINAPI (*COUNINITIALIZE)(VOID); /* Unicode constants */ static const WCHAR AddService[] = {'A','d','d','S','e','r','v','i','c','e',0}; @@ -816,10 +830,306 @@ return TRUE; } -static BOOL profile_items_callback( HINF hinf, PCWSTR field, void *arg ) -{ - FIXME( "should do profile items %s\n", debugstr_w(field) ); +static BOOL Concatenate(int DirId, LPCWSTR SubDirPart, LPCWSTR NamePart, LPWSTR *pFullName) +{ + DWORD dwRequired = 0; + LPCWSTR Dir; + LPWSTR FullName; + + *pFullName = NULL; + + Dir = DIRID_get_string(DirId); + if (Dir) + dwRequired += wcslen(Dir) + 1; + if (SubDirPart) + dwRequired += wcslen(SubDirPart) + 1; + if (NamePart) + dwRequired += wcslen(NamePart); + dwRequired = dwRequired * sizeof(WCHAR) + sizeof(UNICODE_NULL); + + FullName = MyMalloc(dwRequired); + if (!FullName) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + FullName[0] = UNICODE_NULL; + + if (Dir) + { + wcscat(FullName, Dir); + if (FullName[wcslen(FullName) - 1] != '\\') + wcscat(FullName, BackSlash); + } + if (SubDirPart) + { + wcscat(FullName, SubDirPart); + if (FullName[wcslen(FullName) - 1] != '\\') + wcscat(FullName, BackSlash); + } + if (NamePart) + wcscat(FullName, NamePart); + + *pFullName = FullName; return TRUE; +} + +/*********************************************************************** + * profile_items_callback + * + * Called once for each ProfileItems entry in a given section. + */ +static BOOL +profile_items_callback( + IN HINF hInf, + IN PCWSTR SectionName, + IN PVOID Arg) +{ + INFCONTEXT Context; + LPWSTR LinkSubDir = NULL, LinkName = NULL; + INT LinkAttributes = 0; + INT FileDirId = 0; + LPWSTR FileSubDir = NULL; + INT DirId = 0; + LPWSTR SubDirPart = NULL, NamePart = NULL; + LPWSTR FullLinkName = NULL, FullFileName = NULL, FullWorkingDir = NULL, FullIconName = NULL; + INT IconIdx = 0; + LPWSTR lpHotKey = NULL, lpInfoTip = NULL; + LPWSTR DisplayName = NULL; + INT DisplayResId = 0; + BOOL ret = FALSE; + DWORD Index, Required; + + IShellLinkW *psl; + IPersistFile *ppf; + HMODULE hOle32 = NULL; + COINITIALIZE pCoInitialize; + COCREATEINSTANCE pCoCreateInstance; + COUNINITIALIZE pCoUninitialize; + HRESULT hr; + + TRACE("hInf %p, SectionName %s, Arg %p\n", + hInf, debugstr_w(SectionName), Arg); + + /* Read 'Name' entry */ + if (!SetupFindFirstLineW(hInf, SectionName, Name, &Context)) + goto cleanup; + if (!GetStringField(&Context, 1, &LinkName)) + goto cleanup; + if (SetupGetFieldCount(&Context) >= 2) + { + if (!SetupGetIntField(&Context, 2, &LinkAttributes)) + goto cleanup; + } + + /* Read 'CmdLine' entry */ + if (!SetupFindFirstLineW(hInf, SectionName, CmdLine, &Context)) + goto cleanup; + Index = 1; + if (!SetupGetIntField(&Context, Index++, &FileDirId)) + goto cleanup; + if (SetupGetFieldCount(&Context) >= 3) + { + if (!GetStringField(&Context, Index++, &FileSubDir)) + goto cleanup; + } + if (!GetStringField(&Context, Index++, &NamePart)) + goto cleanup; + if (!Concatenate(FileDirId, FileSubDir, NamePart, &FullFileName)) + goto cleanup; + MyFree(NamePart); + NamePart = NULL; + + /* Read 'SubDir' entry */ + if ((LinkAttributes & FLG_PROFITEM_GROUP) == 0 && SetupFindFirstLineW(hInf, SectionName, SubDir, &Context)) + { + if (!GetStringField(&Context, 1, &LinkSubDir)) + goto cleanup; + } + + /* Read 'WorkingDir' entry */ + if (SetupFindFirstLineW(hInf, SectionName, WorkingDir, &Context)) + { + if (!SetupGetIntField(&Context, 1, &DirId)) + goto cleanup; + if (SetupGetFieldCount(&Context) >= 2) + { + if (!GetStringField(&Context, 2, &SubDirPart)) + goto cleanup; + } + if (!Concatenate(DirId, SubDirPart, NULL, &FullWorkingDir)) + goto cleanup; + MyFree(SubDirPart); + SubDirPart = NULL; + } + else + { + if (!Concatenate(FileDirId, FileSubDir, NULL, &FullWorkingDir)) + goto cleanup; + } + + /* Read 'IconPath' entry */ + if (SetupFindFirstLineW(hInf, SectionName, IconPath, &Context)) + { + Index = 1; + if (!SetupGetIntField(&Context, Index++, &DirId)) + goto cleanup; + if (SetupGetFieldCount(&Context) >= 3) + { + if (!GetStringField(&Context, Index++, &SubDirPart)) + goto cleanup; + } + if (!GetStringField(&Context, Index, &NamePart)) + goto cleanup; + if (!Concatenate(DirId, SubDirPart, NamePart, &FullIconName)) + goto cleanup; + MyFree(SubDirPart); + MyFree(NamePart); + SubDirPart = NamePart = NULL; + } + else + { + FullIconName = DuplicateString(FullFileName); + if (!FullIconName) + goto cleanup; + } + + /* Read 'IconIndex' entry */ + if (SetupFindFirstLineW(hInf, SectionName, IconIndex, &Context)) + { + if (!SetupGetIntField(&Context, 1, &IconIdx)) + goto cleanup; + } + + /* Read 'HotKey' and 'InfoTip' entries */ + GetLineText(hInf, SectionName, HotKey, &lpHotKey); + GetLineText(hInf, SectionName, InfoTip, &lpInfoTip); + + /* Read 'DisplayResource' entry */ + if (SetupFindFirstLineW(hInf, SectionName, DisplayResource, &Context)) + { + if (!GetStringField(&Context, 1, &DisplayName)) + goto cleanup; + if (!SetupGetIntField(&Context, 2, &DisplayResId)) + goto cleanup; + } + + /* Some debug */ + TRACE("Link is %s\\%s, attributes 0x%x\n", debugstr_w(LinkSubDir), debugstr_w(LinkName), LinkAttributes); + TRACE("File is %s\n", debugstr_w(FullFileName)); + TRACE("Working dir %s\n", debugstr_w(FullWorkingDir)); + TRACE("Icon is %s, %d\n", debugstr_w(FullIconName), IconIdx); + TRACE("Hotkey %s\n", debugstr_w(lpHotKey)); + TRACE("InfoTip %s\n", debugstr_w(lpInfoTip)); + TRACE("Display %s, %d\n", DisplayName, DisplayResId); + + /* Load ole32.dll */ + hOle32 = LoadLibraryA("ole32.dll"); + if (!hOle32) + goto cleanup; + pCoInitialize = (COINITIALIZE)GetProcAddress(hOle32, "CoInitialize"); + if (!pCoInitialize) + goto cleanup; + pCoCreateInstance = (COCREATEINSTANCE)GetProcAddress(hOle32, "CoCreateInstance"); + if (!pCoCreateInstance) + goto cleanup; + pCoUninitialize = (COUNINITIALIZE)GetProcAddress(hOle32, "CoUninitialize"); + if (!pCoUninitialize) + goto cleanup; + + /* Create shortcut */ + hr = pCoInitialize(NULL); + if (!SUCCEEDED(hr)) + { + if (HRESULT_FACILITY(hr) == FACILITY_WIN32) + SetLastError(HRESULT_CODE(hr)); + else + SetLastError(E_FAIL); + goto cleanup; + } + hr = pCoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkW, (LPVOID*)&psl); + if (SUCCEEDED(hr)) + { + /* Fill link properties */ + if (SUCCEEDED(hr)) + hr = IShellLinkW_SetPath(psl, FullFileName); + if (SUCCEEDED(hr)) + hr = IShellLinkW_SetWorkingDirectory(psl, FullWorkingDir); + if (SUCCEEDED(hr)) + hr = IShellLinkW_SetIconLocation(psl, FullIconName, IconIdx); + if (SUCCEEDED(hr) && lpHotKey) + FIXME("Need to store hotkey %s in shell link\n", debugstr_w(lpHotKey)); + if (SUCCEEDED(hr) && lpInfoTip) + hr = IShellLinkW_SetDescription(psl, lpInfoTip); + if (SUCCEEDED(hr) && DisplayName) + FIXME("Need to store display name %s, %d in shell link\n", debugstr_w(DisplayName), DisplayResId); + if (SUCCEEDED(hr)) + { + hr = IShellLinkW_QueryInterface(psl, &IID_IPersistFile, (LPVOID*)&ppf); + if (SUCCEEDED(hr)) + { + Required = (MAX_PATH + wcslen(LinkSubDir) + 1 + wcslen(LinkName)) * sizeof(WCHAR); + FullLinkName = MyMalloc(Required); + if (!FullLinkName) + hr = E_OUTOFMEMORY; + else + { + if (LinkAttributes & (FLG_PROFITEM_DELETE | FLG_PROFITEM_GROUP)) + FIXME("Need to handle FLG_PROFITEM_DELETE and FLG_PROFITEM_GROUP\n"); + if (SHGetSpecialFolderPathW( + NULL, + FullLinkName, + LinkAttributes & FLG_PROFITEM_CURRENTUSER ? CSIDL_PROGRAMS : CSIDL_COMMON_PROGRAMS, + TRUE)) + { + if (FullLinkName[wcslen(FullLinkName) - 1] != '\\') + wcscat(FullLinkName, BaskSlash); + if (LinkSubDir) + { + wcscat(FullLinkName, LinkSubDir); + if (FullLinkName[wcslen(FullLinkName) - 1] != '\\') + wcscat(FullLinkName, BaskSlash); + } + wcscat(FullLinkName, LinkName); + hr = IPersistFile_Save(ppf, FullLinkName, TRUE); + } + else + hr = HRESULT_FROM_WIN32(GetLastError()); + } + IPersistFile_Release(ppf); + } + } + IShellLinkW_Release(psl); + } + pCoUninitialize(); + if (SUCCEEDED(hr)) + ret = TRUE; + else + { + if (HRESULT_FACILITY(hr) == FACILITY_WIN32) + SetLastError(HRESULT_CODE(hr)); + else + SetLastError(E_FAIL); + } + +cleanup: + MyFree(LinkSubDir); + MyFree(LinkName); + MyFree(FileSubDir); + MyFree(SubDirPart); + MyFree(NamePart); + MyFree(FullFileName); + MyFree(FullWorkingDir); + MyFree(FullIconName); + MyFree(FullLinkName); + MyFree(lpHotKey); + MyFree(lpInfoTip); + MyFree(DisplayName); + if (hOle32) + FreeLibrary(hOle32); + + TRACE("Returning %d\n", ret); + return ret; } static BOOL copy_inf_callback( HINF hinf, PCWSTR field, void *arg ) Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h Wed Oct 17 17:43:40 2007 @@ -28,6 +28,7 @@ #include <wchar.h> #define WIN32_NO_STATUS +#define COBJMACROS #include <windows.h> #include <aclapi.h> #include <cfgmgr32.h>

1 0

[hpoussin] 29638: Commit again changes of r25834, which were reverted in r29507. See issue #1918 for more details.
by hpoussin＠svn.reactos.org 17 Oct '07

17 Oct '07

Author: hpoussin Date: Wed Oct 17 17:42:53 2007 New Revision: 29638 URL: http://svn.reactos.org/svn/reactos?rev=29638&view=rev Log: Commit again changes of r25834, which were reverted in r29507. See issue #1918 for more details. Modified: trunk/reactos/dll/win32/shell32/control.c Modified: trunk/reactos/dll/win32/shell32/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/control.… ============================================================================== --- trunk/reactos/dll/win32/shell32/control.c (original) +++ trunk/reactos/dll/win32/shell32/control.c Wed Oct 17 17:42:53 2007 @@ -352,6 +352,7 @@ unsigned sp = 0; LPWSTR extraPmts = NULL; int quoted = 0; + BOOL spSet = FALSE; buffer = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(wszCmd) + 1) * sizeof(*wszCmd)); if (!buffer) return; @@ -366,8 +367,10 @@ if (beg) { if (*beg == '@') { sp = atoiW(beg + 1); + spSet = TRUE; } else if (*beg == '\0') { sp = 0; + spSet = TRUE; } else { extraPmts = beg; } @@ -381,6 +384,9 @@ while ((ptr = StrChrW(buffer, '"'))) memmove(ptr, ptr+1, lstrlenW(ptr)*sizeof(WCHAR)); + while ((ptr = StrChrW(extraPmts, '"'))) + memmove(ptr, ptr+1, lstrlenW(ptr)*sizeof(WCHAR)); + TRACE("cmd %s, extra %s, sp %d\n", debugstr_w(buffer), debugstr_w(extraPmts), sp); Control_LoadApplet(hWnd, buffer, panel); @@ -393,6 +399,13 @@ WARN("Out of bounds (%u >= %u), setting to 0\n", sp, applet->count); sp = 0; } + + if ((extraPmts)&&(!spSet)) + { + while ((lstrcmpiW(extraPmts, applet->info[sp].szName)) && (sp < applet->count)) + sp++; + } + if (applet->info[sp].dwSize) { if (!applet->proc(applet->hWnd, CPL_STARTWPARMSA, sp, (LPARAM)extraPmts)) applet->proc(applet->hWnd, CPL_DBLCLK, sp, applet->info[sp].lData);

1 0

[gedmurphy] 29637: silence stray debug message
by gedmurphy＠svn.reactos.org 17 Oct '07

17 Oct '07

Author: gedmurphy Date: Wed Oct 17 14:33:12 2007 New Revision: 29637 URL: http://svn.reactos.org/svn/reactos?rev=29637&view=rev Log: silence stray debug message Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Wed Oct 17 14:33:12 2007 @@ -587,7 +587,7 @@ { DestPalette = PALETTE_LockPalette(hDestPalette); /* FIXME - DestPalette can be NULL!!!! Don't assert here!!! */ - DPRINT1("DestPalette : %p\n", DestPalette); + DPRINT("DestPalette : %p\n", DestPalette); ASSERT(DestPalette); DestPaletteType = DestPalette->Mode; }

1 0

[fireball] 29636: - LdrpAttachToProcess() should be called only once per process, so added the check. This fixes a crash when trying to start any app using MFC42.DLL, including 1C. See issue #2730 for more details.
by fireball＠svn.reactos.org 17 Oct '07

17 Oct '07

Author: fireball Date: Wed Oct 17 14:01:03 2007 New Revision: 29636 URL: http://svn.reactos.org/svn/reactos?rev=29636&view=rev Log: - LdrpAttachToProcess() should be called only once per process, so added the check. This fixes a crash when trying to start any app using MFC42.DLL, including 1C. See issue #2730 for more details. Modified: trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c Wed Oct 17 14:01:03 2007 @@ -748,9 +748,12 @@ if (NT_SUCCESS(Status) && (!LoadFlags || 0 == (*LoadFlags & LOAD_LIBRARY_AS_DATAFILE))) { - RtlEnterCriticalSection(Peb->LoaderLock); - Status = LdrpAttachProcess(); - RtlLeaveCriticalSection(Peb->LoaderLock); + if (!(Module->Flags & LDRP_PROCESS_ATTACH_CALLED)) + { + RtlEnterCriticalSection(Peb->LoaderLock); + Status = LdrpAttachProcess(); + RtlLeaveCriticalSection(Peb->LoaderLock); + } } if ((!Module) && (NT_SUCCESS(Status)))

1 0

[mnordell] 29635: proper PSEH return usage (thanks janderwald)
by mnordell＠svn.reactos.org 17 Oct '07

17 Oct '07

Author: mnordell Date: Wed Oct 17 13:19:09 2007 New Revision: 29635 URL: http://svn.reactos.org/svn/reactos?rev=29635&view=rev Log: proper PSEH return usage (thanks janderwald) Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c Wed Oct 17 13:19:09 2007 @@ -649,7 +649,7 @@ { /* Get the exception code */ Status = _SEH_GetExceptionCode(); - return(Status); /* Correct? NT5 returns STATUS_ACCESS_VIOLATION ? */ + _SEH_YIELD(return Status); } _SEH_END;

1 0

[hpoussin] 29634: Add missing WINAPI keyword
by hpoussin＠svn.reactos.org 17 Oct '07

17 Oct '07

Author: hpoussin Date: Wed Oct 17 13:10:02 2007 New Revision: 29634 URL: http://svn.reactos.org/svn/reactos?rev=29634&view=rev Log: Add missing WINAPI keyword Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c trunk/reactos/include/psdk/shlobj.h Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Wed Oct 17 13:10:02 2007 @@ -605,14 +605,11 @@ * */ -HRESULT SHCreateDefaultContextMenu( +HRESULT WINAPI SHCreateDefaultContextMenu( const DEFCONTEXTMENU *pdcm, REFIID riid, void **ppv) { - - - return E_FAIL; } Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h (original) +++ trunk/reactos/include/psdk/shlobj.h Wed Oct 17 13:10:02 2007 @@ -1389,7 +1389,7 @@ const HKEY *aKeys; }DEFCONTEXTMENU; -HRESULT SHCreateDefaultContextMenu(const DEFCONTEXTMENU *,REFIID,void **ppv); +HRESULT WINAPI SHCreateDefaultContextMenu(const DEFCONTEXTMENU *,REFIID,void **ppv); typedef HRESULT (CALLBACK * LPFNDFMCALLBACK)(IShellFolder*,HWND,IDataObject*,UINT,WPARAM,LPARAM); INT CDefFolderMenu_Create2(LPCITEMIDLIST,HWND,UINT,LPCITEMIDLIST*,IShellFolder*,LPFNDFMCALLBACK,UINT,HKEY *,IContextMenu **);

1 0

[mnordell] 29633: Fix PAGE_ROUND_DOWN, PAGE_ROUND_UP, and a user of them (correctness and speedup)
by mnordell＠svn.reactos.org 17 Oct '07

17 Oct '07

Author: mnordell Date: Wed Oct 17 12:31:02 2007 New Revision: 29633 URL: http://svn.reactos.org/svn/reactos?rev=29633&view=rev Log: Fix PAGE_ROUND_DOWN, PAGE_ROUND_UP, and a user of them (correctness and speedup) Modified: trunk/reactos/include/ndk/mmtypes.h trunk/reactos/include/reactos/helper.h trunk/reactos/ntoskrnl/mm/virtual.c Modified: trunk/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmtypes.h (original) +++ trunk/reactos/include/ndk/mmtypes.h Wed Oct 17 12:31:02 2007 @@ -30,11 +30,9 @@ // Page-Rounding Macros // #define PAGE_ROUND_DOWN(x) \ - (((ULONG_PTR)x)&(~(PAGE_SIZE-1))) + (((ULONG_PTR)(x))&(~(PAGE_SIZE-1))) #define PAGE_ROUND_UP(x) \ - ( (((ULONG_PTR)x)%PAGE_SIZE) ? \ - ((((ULONG_PTR)x)&(~(PAGE_SIZE-1)))+PAGE_SIZE) : \ - ((ULONG_PTR)x) ) + ( (((ULONG_PTR)(x)) + PAGE_SIZE-1) & (~(PAGE_SIZE-1)) ) #ifdef NTOS_MODE_USER #define ROUND_TO_PAGES(Size) \ (((ULONG_PTR)(Size) + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1)) Modified: trunk/reactos/include/reactos/helper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/helper.h?r… ============================================================================== --- trunk/reactos/include/reactos/helper.h (original) +++ trunk/reactos/include/reactos/helper.h Wed Oct 17 12:31:02 2007 @@ -20,11 +20,11 @@ #endif #ifndef PAGE_ROUND_DOWN -#define PAGE_ROUND_DOWN(x) (((ULONG_PTR)x)&(~(PAGE_SIZE-1))) +#define PAGE_ROUND_DOWN(x) (((ULONG_PTR)(x))&(~(PAGE_SIZE-1))) #endif #ifndef PAGE_ROUND_UP -#define PAGE_ROUND_UP(x) ( (((ULONG_PTR)x)%PAGE_SIZE) ? ((((ULONG_PTR)x)&(~(PAGE_SIZE-1)))+PAGE_SIZE) : ((ULONG_PTR)x) ) +#define PAGE_ROUND_UP(x) ( (((ULONG_PTR)(x)) + PAGE_SIZE-1) & (~(PAGE_SIZE-1)) ) #endif #define ABS_VALUE(V) (((V) < 0) ? -(V) : (V)) Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/virtual.c (original) +++ trunk/reactos/ntoskrnl/mm/virtual.c Wed Oct 17 12:31:02 2007 @@ -390,7 +390,7 @@ NTSTATUS Status; *NumberOfBytesToProtect = - PAGE_ROUND_UP((*BaseAddress) + (*NumberOfBytesToProtect)) - + PAGE_ROUND_UP((ULONG_PTR)(*BaseAddress) + (*NumberOfBytesToProtect)) - PAGE_ROUND_DOWN(*BaseAddress); *BaseAddress = (PVOID)PAGE_ROUND_DOWN(*BaseAddress);

1 0

[mnordell] 29632: Probe arguments if coming from usermode. Use previous mode when referencing process handle. Actually specify PsProcessType for process handle. Some minor cleanup (less compiled code and some speedup).
by mnordell＠svn.reactos.org 17 Oct '07

17 Oct '07

Author: mnordell Date: Wed Oct 17 12:16:20 2007 New Revision: 29632 URL: http://svn.reactos.org/svn/reactos?rev=29632&view=rev Log: Probe arguments if coming from usermode. Use previous mode when referencing process handle. Actually specify PsProcessType for process handle. Some minor cleanup (less compiled code and some speedup). Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c Wed Oct 17 12:16:20 2007 @@ -516,12 +516,12 @@ * @implemented */ NTSTATUS STDCALL -NtAllocateVirtualMemory(IN HANDLE ProcessHandle, - IN OUT PVOID* UBaseAddress, - IN ULONG ZeroBits, +NtAllocateVirtualMemory(IN HANDLE ProcessHandle, + IN OUT PVOID* UBaseAddress, + IN ULONG ZeroBits, IN OUT PULONG URegionSize, - IN ULONG AllocationType, - IN ULONG Protect) + IN ULONG AllocationType, + IN ULONG Protect) /* * FUNCTION: Allocates a block of virtual memory in the process address space * ARGUMENTS: @@ -542,6 +542,10 @@ * PAGE_EXECUTE_READ, PAGE_EXECUTE_READWRITE, PAGE_GUARD, * PAGE_NOACCESS * RETURNS: Status + * NOTES: Must run at IRQL PASSIVE_LEVEL? (or is APC_LEVEL cool too?) + * MSDN states that ZwAllocateVirtualMemory IRQL must be PASSIVE_LEVEL, + * but why wouldn't APC_LEVEL be valid (or is that only for the Zw* version + * and Nt* can indeed run at APC_LEVEL?) */ { PEPROCESS Process; @@ -555,6 +559,12 @@ PVOID PBaseAddress; ULONG PRegionSize; PHYSICAL_ADDRESS BoundaryAddressMultiple; + KPROCESSOR_MODE PreviousMode; + + // TMN: Someone Pick one of these. Until it's clear which + // level is allowed, I play it safe and check for <= APC_LEVEL + PAGED_CODE(); +// ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); DPRINT("NtAllocateVirtualMemory(*UBaseAddress %x, " "ZeroBits %d, *URegionSize %x, AllocationType %x, Protect %x)\n", @@ -576,7 +586,7 @@ } /* Check for valid Allocation Types */ - if ((AllocationType &~ (MEM_COMMIT | MEM_RESERVE | MEM_RESET | MEM_PHYSICAL | + if ((AllocationType & ~(MEM_COMMIT | MEM_RESERVE | MEM_RESET | MEM_PHYSICAL | MEM_TOP_DOWN | MEM_WRITE_WATCH))) { DPRINT1("Invalid Allocation Type\n"); @@ -593,7 +603,7 @@ /* MEM_RESET is an exclusive flag, make sure that is valid too */ if ((AllocationType & MEM_RESET) && (AllocationType != MEM_RESET)) { - DPRINT1("MEM_RESET used illegaly\n"); + DPRINT1("Invalid use of MEM_RESET\n"); return STATUS_INVALID_PARAMETER_5; } @@ -623,12 +633,30 @@ } } - PBaseAddress = *UBaseAddress; - PRegionSize = *URegionSize; + PreviousMode = KeGetPreviousMode(); + + _SEH_TRY + { + if (PreviousMode != KernelMode) + { + ProbeForWritePointer(UBaseAddress); + ProbeForWriteUlong(URegionSize); + } + PBaseAddress = *UBaseAddress; + PRegionSize = *URegionSize; + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + return(Status); /* Correct? NT5 returns STATUS_ACCESS_VIOLATION ? */ + } + _SEH_END; + BoundaryAddressMultiple.QuadPart = 0; BaseAddress = (PVOID)PAGE_ROUND_DOWN(PBaseAddress); - RegionSize = PAGE_ROUND_UP(PBaseAddress + PRegionSize) - + RegionSize = PAGE_ROUND_UP((ULONG_PTR)PBaseAddress + PRegionSize) - PAGE_ROUND_DOWN(PBaseAddress); /* @@ -638,12 +666,12 @@ */ if (BaseAddress >= MM_HIGHEST_USER_ADDRESS) { - DPRINT1("Virtual allocation above User Space\n"); + DPRINT1("Virtual allocation base above User Space\n"); return STATUS_INVALID_PARAMETER_2; } if (!RegionSize) { - DPRINT1("Region size is invalid\n"); + DPRINT1("Region size is invalid (zero)\n"); return STATUS_INVALID_PARAMETER_4; } if (((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (ULONG_PTR)BaseAddress) < RegionSize) @@ -657,7 +685,7 @@ * but there may be other cases...needs more testing */ if ((!BaseAddress || (AllocationType & MEM_RESERVE)) && - ((Protect & PAGE_WRITECOPY) || (Protect & PAGE_EXECUTE_WRITECOPY))) + (Protect & (PAGE_WRITECOPY | PAGE_EXECUTE_WRITECOPY))) { DPRINT1("Copy on write is not supported by VirtualAlloc\n"); return STATUS_INVALID_PAGE_PROTECTION; @@ -666,8 +694,8 @@ Status = ObReferenceObjectByHandle(ProcessHandle, PROCESS_VM_OPERATION, - NULL, - UserMode, + PsProcessType, + PreviousMode, (PVOID*)(&Process), NULL); if (!NT_SUCCESS(Status)) @@ -750,10 +778,10 @@ MemoryAreaLength, Type, Protect); if ((AllocationType & MEM_COMMIT) && - ((Protect & PAGE_READWRITE) || - (Protect & PAGE_EXECUTE_READWRITE))) - { - MmReserveSwapPages(MemoryAreaLength); + (Protect & (PAGE_READWRITE | PAGE_EXECUTE_READWRITE))) + { + const ULONG nPages = PAGE_ROUND_UP(MemoryAreaLength) >> PAGE_SHIFT; + MmReserveSwapPages(nPages); } *UBaseAddress = BaseAddress; @@ -816,17 +844,11 @@ { ULONG_PTR MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - (ULONG_PTR)MemoryArea->StartingAddress; - - /* FiN TODO: Optimize loop counter! */ - for (i = 0; i < PAGE_ROUND_UP(MemoryAreaLength) / PAGE_SIZE; i++) + const ULONG nPages = PAGE_ROUND_UP(MemoryAreaLength) >> PAGE_SHIFT; + + for (i = 0; i < nPages && MemoryArea->PageOpCount != 0; ++i) { PMM_PAGEOP PageOp; - - if (MemoryArea->PageOpCount == 0) - { - break; - } - PageOp = MmCheckForPageOp(MemoryArea, Process->UniqueProcessId, (PVOID)((ULONG_PTR)MemoryArea->StartingAddress + (i * PAGE_SIZE)), NULL, 0); @@ -899,7 +921,7 @@ *PRegionSize,FreeType); BaseAddress = (PVOID)PAGE_ROUND_DOWN((*PBaseAddress)); - RegionSize = PAGE_ROUND_UP((*PBaseAddress) + (*PRegionSize)) - + RegionSize = PAGE_ROUND_UP((ULONG_PTR)(*PBaseAddress) + (*PRegionSize)) - PAGE_ROUND_DOWN((*PBaseAddress)); Status = ObReferenceObjectByHandle(ProcessHandle, @@ -919,9 +941,8 @@ MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); if (MemoryArea == NULL) { - MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); - return(STATUS_UNSUCCESSFUL); + Status = STATUS_UNSUCCESSFUL; + goto unlock_deref_and_return; } switch (FreeType) @@ -931,14 +952,13 @@ if (MemoryArea->StartingAddress != BaseAddress || MemoryArea->Type != MEMORY_AREA_VIRTUAL_MEMORY) { - MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); - return(STATUS_UNSUCCESSFUL); + Status = STATUS_UNSUCCESSFUL; + goto unlock_deref_and_return; } + MmFreeVirtualMemory(Process, MemoryArea); - MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); - return(STATUS_SUCCESS); + Status = STATUS_SUCCESS; + goto unlock_deref_and_return; case MEM_DECOMMIT: Status = @@ -950,13 +970,17 @@ MEM_RESERVE, PAGE_NOACCESS, MmModifyAttributes); - MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); - return(Status); - } + goto unlock_deref_and_return; + } + + Status = STATUS_NOT_IMPLEMENTED; + +unlock_deref_and_return: + MmUnlockAddressSpace(AddressSpace); ObDereferenceObject(Process); - return(STATUS_NOT_IMPLEMENTED); + + return(Status); } NTSTATUS

1 0

[cfinck] 29631: Get the language for the top and left menu of the Wiki from the RosCMS Cookie. Fixes a part of bug 1590. See issue #1590 for more details.
by cfinck＠svn.reactos.org 16 Oct '07

16 Oct '07

Author: cfinck Date: Tue Oct 16 23:54:15 2007 New Revision: 29631 URL: http://svn.reactos.org/svn/reactos?rev=29631&view=rev Log: Get the language for the top and left menu of the Wiki from the RosCMS Cookie. Fixes a part of bug 1590. See issue #1590 for more details. Modified: trunk/web/reactos.org/htdocs/wiki/skins/RosCMS.php Modified: trunk/web/reactos.org/htdocs/wiki/skins/RosCMS.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/wiki/skins/… ============================================================================== --- trunk/web/reactos.org/htdocs/wiki/skins/RosCMS.php (original) +++ trunk/web/reactos.org/htdocs/wiki/skins/RosCMS.php Tue Oct 16 23:54:15 2007 @@ -97,8 +97,12 @@ class="mediawiki <?php $this->text('nsclass') ?> <?php $this->text('dir') ?> <?php $this->text('pageclass') ?>"> <?php - readfile("http://www.reactos.org/en/subsys_extern_menu_top.html"); - readfile("http://www.reactos.org/en/subsys_extern_menu_left.html"); + $userlang = $_COOKIE["roscms_usrset_lang"]; + if(strlen($userlang) != 2) + $userlang = "en"; + + readfile("http://www.reactos.org/$userlang/subsys_extern_menu_top.html"); + readfile("http://www.reactos.org/$userlang/subsys_extern_menu_left.html"); ?> <div class="navTitle">Wiki</div>

1 0

[cfinck] 29630: Merge the cards of "cardsbav" to our cards.dll and specify, which cards shall be compiled into the cards.dll, with preprocessor definitions in cards.rbuild. This change obsoletes the old cardsbav.dll, so I removed it.
by cfinck＠svn.reactos.org 16 Oct '07

16 Oct '07

Author: cfinck Date: Tue Oct 16 22:33:03 2007 New Revision: 29630 URL: http://svn.reactos.org/svn/reactos?rev=29630&view=rev Log: Merge the cards of "cardsbav" to our cards.dll and specify, which cards shall be compiled into the cards.dll, with preprocessor definitions in cards.rbuild. This change obsoletes the old cardsbav.dll, so I removed it. Added: trunk/reactos/dll/win32/cards/res/bavarian/ trunk/reactos/dll/win32/cards/res/bavarian/Eichel10.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Eichel10.bmp trunk/reactos/dll/win32/cards/res/bavarian/Eichel2.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Eichel2.bmp trunk/reactos/dll/win32/cards/res/bavarian/Eichel3.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Eichel3.bmp trunk/reactos/dll/win32/cards/res/bavarian/Eichel4.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Eichel4.bmp trunk/reactos/dll/win32/cards/res/bavarian/Eichel5.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Eichel5.bmp trunk/reactos/dll/win32/cards/res/bavarian/Eichel6.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Eichel6.bmp trunk/reactos/dll/win32/cards/res/bavarian/Eichel7.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Eichel7.bmp trunk/reactos/dll/win32/cards/res/bavarian/Eichel8.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Eichel8.bmp trunk/reactos/dll/win32/cards/res/bavarian/Eichel9.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Eichel9.bmp trunk/reactos/dll/win32/cards/res/bavarian/EichelAs.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/EichelAs.bmp trunk/reactos/dll/win32/cards/res/bavarian/EichelKoenig.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/EichelKoenig.bmp trunk/reactos/dll/win32/cards/res/bavarian/EichelOber.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/EichelOber.bmp trunk/reactos/dll/win32/cards/res/bavarian/EichelUnter.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/EichelUnter.bmp trunk/reactos/dll/win32/cards/res/bavarian/FreeCard.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/FreeCard.bmp trunk/reactos/dll/win32/cards/res/bavarian/Gras10.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Gras10.bmp trunk/reactos/dll/win32/cards/res/bavarian/Gras2.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Gras2.bmp trunk/reactos/dll/win32/cards/res/bavarian/Gras3.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Gras3.bmp trunk/reactos/dll/win32/cards/res/bavarian/Gras4.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Gras4.bmp trunk/reactos/dll/win32/cards/res/bavarian/Gras5.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Gras5.bmp trunk/reactos/dll/win32/cards/res/bavarian/Gras6.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Gras6.bmp trunk/reactos/dll/win32/cards/res/bavarian/Gras7.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Gras7.bmp trunk/reactos/dll/win32/cards/res/bavarian/Gras8.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Gras8.bmp trunk/reactos/dll/win32/cards/res/bavarian/Gras9.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Gras9.bmp trunk/reactos/dll/win32/cards/res/bavarian/GrasAs.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/GrasAs.bmp trunk/reactos/dll/win32/cards/res/bavarian/GrasKoenig.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/GrasKoenig.bmp trunk/reactos/dll/win32/cards/res/bavarian/GrasOber.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/GrasOber.bmp trunk/reactos/dll/win32/cards/res/bavarian/GrasUnter.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/GrasUnter.bmp trunk/reactos/dll/win32/cards/res/bavarian/Herz10.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Herz10.bmp trunk/reactos/dll/win32/cards/res/bavarian/Herz2.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Herz2.bmp trunk/reactos/dll/win32/cards/res/bavarian/Herz3.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Herz3.bmp trunk/reactos/dll/win32/cards/res/bavarian/Herz4.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Herz4.bmp trunk/reactos/dll/win32/cards/res/bavarian/Herz5.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Herz5.bmp trunk/reactos/dll/win32/cards/res/bavarian/Herz6.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Herz6.bmp trunk/reactos/dll/win32/cards/res/bavarian/Herz7.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Herz7.bmp trunk/reactos/dll/win32/cards/res/bavarian/Herz8.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Herz8.bmp trunk/reactos/dll/win32/cards/res/bavarian/Herz9.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Herz9.bmp trunk/reactos/dll/win32/cards/res/bavarian/HerzAs.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/HerzAs.bmp trunk/reactos/dll/win32/cards/res/bavarian/HerzKoenig.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/HerzKoenig.bmp trunk/reactos/dll/win32/cards/res/bavarian/HerzOber.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/HerzOber.bmp trunk/reactos/dll/win32/cards/res/bavarian/HerzUnter.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/HerzUnter.bmp trunk/reactos/dll/win32/cards/res/bavarian/Joker.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Joker.bmp trunk/reactos/dll/win32/cards/res/bavarian/OSign.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/OSign.bmp trunk/reactos/dll/win32/cards/res/bavarian/Ruecken.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Ruecken.bmp trunk/reactos/dll/win32/cards/res/bavarian/Schellen10.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Schellen10.bmp trunk/reactos/dll/win32/cards/res/bavarian/Schellen2.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Schellen2.bmp trunk/reactos/dll/win32/cards/res/bavarian/Schellen3.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Schellen3.bmp trunk/reactos/dll/win32/cards/res/bavarian/Schellen4.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Schellen4.bmp trunk/reactos/dll/win32/cards/res/bavarian/Schellen5.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Schellen5.bmp trunk/reactos/dll/win32/cards/res/bavarian/Schellen6.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Schellen6.bmp trunk/reactos/dll/win32/cards/res/bavarian/Schellen7.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Schellen7.bmp trunk/reactos/dll/win32/cards/res/bavarian/Schellen8.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Schellen8.bmp trunk/reactos/dll/win32/cards/res/bavarian/Schellen9.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Schellen9.bmp trunk/reactos/dll/win32/cards/res/bavarian/SchellenAs.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/SchellenAs.bmp trunk/reactos/dll/win32/cards/res/bavarian/SchellenKoenig.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/SchellenKoenig.bmp trunk/reactos/dll/win32/cards/res/bavarian/SchellenOber.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/SchellenOber.bmp trunk/reactos/dll/win32/cards/res/bavarian/SchellenUnter.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/SchellenUnter.bmp trunk/reactos/dll/win32/cards/res/bavarian/XSign.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/XSign.bmp trunk/reactos/dll/win32/cards/res/default/ trunk/reactos/dll/win32/cards/res/default/Background_1.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Background_1.bmp trunk/reactos/dll/win32/cards/res/default/Background_10.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Background_10.bmp trunk/reactos/dll/win32/cards/res/default/Background_11.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Background_11.bmp trunk/reactos/dll/win32/cards/res/default/Background_12.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Background_12.bmp trunk/reactos/dll/win32/cards/res/default/Background_2.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Background_2.bmp trunk/reactos/dll/win32/cards/res/default/Background_3.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Background_3.bmp trunk/reactos/dll/win32/cards/res/default/Background_4.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Background_4.bmp trunk/reactos/dll/win32/cards/res/default/Background_5.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Background_5.bmp trunk/reactos/dll/win32/cards/res/default/Background_6.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Background_6.bmp trunk/reactos/dll/win32/cards/res/default/Background_7.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Background_7.bmp trunk/reactos/dll/win32/cards/res/default/Background_8.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Background_8.bmp trunk/reactos/dll/win32/cards/res/default/Background_9.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Background_9.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Ace.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Clubs_Ace.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Eight.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Clubs_Eight.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Five.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Clubs_Five.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Four.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Clubs_Four.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Jack.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Clubs_Jack.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_King.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Clubs_King.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Nine.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Clubs_Nine.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Queen.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Clubs_Queen.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Seven.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Clubs_Seven.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Six.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Clubs_Six.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Ten.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Clubs_Ten.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Three.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Clubs_Three.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Two.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Clubs_Two.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Ace.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Diamonds_Ace.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Eight.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Diamonds_Eight.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Five.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Diamonds_Five.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Four.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Diamonds_Four.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Jack.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Diamonds_Jack.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_King.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Diamonds_King.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Nine.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Diamonds_Nine.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Queen.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Diamonds_Queen.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Seven.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Diamonds_Seven.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Six.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Diamonds_Six.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Ten.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Diamonds_Ten.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Three.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Diamonds_Three.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Two.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Diamonds_Two.bmp trunk/reactos/dll/win32/cards/res/default/FreeCard.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/FreeCard.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Ace.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Hearts_Ace.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Eight.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Hearts_Eight.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Five.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Hearts_Five.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Four.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Hearts_Four.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Jack.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Hearts_Jack.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_King.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Hearts_King.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Nine.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Hearts_Nine.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Queen.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Hearts_Queen.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Seven.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Hearts_Seven.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Six.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Hearts_Six.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Ten.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Hearts_Ten.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Three.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Hearts_Three.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Two.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Hearts_Two.bmp trunk/reactos/dll/win32/cards/res/default/Joker.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Joker.bmp trunk/reactos/dll/win32/cards/res/default/OSign.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/OSign.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Ace.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Spades_Ace.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Eight.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Spades_Eight.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Five.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Spades_Five.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Four.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Spades_Four.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Jack.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Spades_Jack.bmp trunk/reactos/dll/win32/cards/res/default/Spades_King.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Spades_King.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Nine.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Spades_Nine.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Queen.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Spades_Queen.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Seven.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Spades_Seven.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Six.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Spades_Six.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Ten.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Spades_Ten.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Three.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Spades_Three.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Two.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Spades_Two.bmp trunk/reactos/dll/win32/cards/res/default/XSign.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/XSign.bmp Removed: trunk/reactos/dll/win32/cards/res/Background_1.bmp trunk/reactos/dll/win32/cards/res/Background_10.bmp trunk/reactos/dll/win32/cards/res/Background_11.bmp trunk/reactos/dll/win32/cards/res/Background_12.bmp trunk/reactos/dll/win32/cards/res/Background_2.bmp trunk/reactos/dll/win32/cards/res/Background_3.bmp trunk/reactos/dll/win32/cards/res/Background_4.bmp trunk/reactos/dll/win32/cards/res/Background_5.bmp trunk/reactos/dll/win32/cards/res/Background_6.bmp trunk/reactos/dll/win32/cards/res/Background_7.bmp trunk/reactos/dll/win32/cards/res/Background_8.bmp trunk/reactos/dll/win32/cards/res/Background_9.bmp trunk/reactos/dll/win32/cards/res/Clubs_Ace.bmp trunk/reactos/dll/win32/cards/res/Clubs_Eight.bmp trunk/reactos/dll/win32/cards/res/Clubs_Five.bmp trunk/reactos/dll/win32/cards/res/Clubs_Four.bmp trunk/reactos/dll/win32/cards/res/Clubs_Jack.bmp trunk/reactos/dll/win32/cards/res/Clubs_King.bmp trunk/reactos/dll/win32/cards/res/Clubs_Nine.bmp trunk/reactos/dll/win32/cards/res/Clubs_Queen.bmp trunk/reactos/dll/win32/cards/res/Clubs_Seven.bmp trunk/reactos/dll/win32/cards/res/Clubs_Six.bmp trunk/reactos/dll/win32/cards/res/Clubs_Ten.bmp trunk/reactos/dll/win32/cards/res/Clubs_Three.bmp trunk/reactos/dll/win32/cards/res/Clubs_Two.bmp trunk/reactos/dll/win32/cards/res/Diamonds_Ace.bmp trunk/reactos/dll/win32/cards/res/Diamonds_Eight.bmp trunk/reactos/dll/win32/cards/res/Diamonds_Five.bmp trunk/reactos/dll/win32/cards/res/Diamonds_Four.bmp trunk/reactos/dll/win32/cards/res/Diamonds_Jack.bmp trunk/reactos/dll/win32/cards/res/Diamonds_King.bmp trunk/reactos/dll/win32/cards/res/Diamonds_Nine.bmp trunk/reactos/dll/win32/cards/res/Diamonds_Queen.bmp trunk/reactos/dll/win32/cards/res/Diamonds_Seven.bmp trunk/reactos/dll/win32/cards/res/Diamonds_Six.bmp trunk/reactos/dll/win32/cards/res/Diamonds_Ten.bmp trunk/reactos/dll/win32/cards/res/Diamonds_Three.bmp trunk/reactos/dll/win32/cards/res/Diamonds_Two.bmp trunk/reactos/dll/win32/cards/res/FreeCard.bmp trunk/reactos/dll/win32/cards/res/Hearts_Ace.bmp trunk/reactos/dll/win32/cards/res/Hearts_Eight.bmp trunk/reactos/dll/win32/cards/res/Hearts_Five.bmp trunk/reactos/dll/win32/cards/res/Hearts_Four.bmp trunk/reactos/dll/win32/cards/res/Hearts_Jack.bmp trunk/reactos/dll/win32/cards/res/Hearts_King.bmp trunk/reactos/dll/win32/cards/res/Hearts_Nine.bmp trunk/reactos/dll/win32/cards/res/Hearts_Queen.bmp trunk/reactos/dll/win32/cards/res/Hearts_Seven.bmp trunk/reactos/dll/win32/cards/res/Hearts_Six.bmp trunk/reactos/dll/win32/cards/res/Hearts_Ten.bmp trunk/reactos/dll/win32/cards/res/Hearts_Three.bmp trunk/reactos/dll/win32/cards/res/Hearts_Two.bmp trunk/reactos/dll/win32/cards/res/Joker.bmp trunk/reactos/dll/win32/cards/res/OSign.bmp trunk/reactos/dll/win32/cards/res/Spades_Ace.bmp trunk/reactos/dll/win32/cards/res/Spades_Eight.bmp trunk/reactos/dll/win32/cards/res/Spades_Five.bmp trunk/reactos/dll/win32/cards/res/Spades_Four.bmp trunk/reactos/dll/win32/cards/res/Spades_Jack.bmp trunk/reactos/dll/win32/cards/res/Spades_King.bmp trunk/reactos/dll/win32/cards/res/Spades_Nine.bmp trunk/reactos/dll/win32/cards/res/Spades_Queen.bmp trunk/reactos/dll/win32/cards/res/Spades_Seven.bmp trunk/reactos/dll/win32/cards/res/Spades_Six.bmp trunk/reactos/dll/win32/cards/res/Spades_Ten.bmp trunk/reactos/dll/win32/cards/res/Spades_Three.bmp trunk/reactos/dll/win32/cards/res/Spades_Two.bmp trunk/reactos/dll/win32/cards/res/XSign.bmp trunk/rosapps/cardsbav/ Modified: trunk/reactos/dll/win32/cards/cards.h trunk/reactos/dll/win32/cards/cards.rbuild trunk/reactos/dll/win32/cards/cards.rc trunk/rosapps/directory.rbuild Modified: trunk/reactos/dll/win32/cards/cards.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.h?re… ============================================================================== --- trunk/reactos/dll/win32/cards/cards.h (original) +++ trunk/reactos/dll/win32/cards/cards.h Tue Oct 16 22:33:03 2007 @@ -41,14 +41,15 @@ #define ectGREENO 7 #define ectSAVEEDGESMASK 0x80000000 -/* Microsoft card dimensions */ -/* -#define CARD_WIDTH 71 -#define CARD_HEIGHT 96 -*/ -/* MacSolitaireX's card dimensions */ -#define CARD_WIDTH 72 -#define CARD_HEIGHT 96 +#if defined(CARDSTYLE_DEFAULT) +# define CARD_WIDTH 72 // The original Microsoft cards are 71px wide, but ours are taken from MacSolitaireX +# define CARD_HEIGHT 96 +#elif defined(CARDSTYLE_BAVARIAN) +# define CARD_WIDTH 110 +# define CARD_HEIGHT 198 +#else +# error No or unsupported cardstyle defined +#endif #define ISREDCARD(x) (x >= 13 && x <= 39) Modified: trunk/reactos/dll/win32/cards/cards.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.rbui… ============================================================================== --- trunk/reactos/dll/win32/cards/cards.rbuild (original) +++ trunk/reactos/dll/win32/cards/cards.rbuild Tue Oct 16 22:33:03 2007 @@ -4,6 +4,10 @@ <define name="UNICODE" /> <define name="_UNICODE" /> <define name="__USE_W32API" /> + +  + <define name="CARDSTYLE_DEFAULT" /> + <library>kernel32</library> <library>gdi32</library> <library>user32</library> Modified: trunk/reactos/dll/win32/cards/cards.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.rc?r… ============================================================================== --- trunk/reactos/dll/win32/cards/cards.rc (original) +++ trunk/reactos/dll/win32/cards/cards.rc Tue Oct 16 22:33:03 2007 @@ -28,71 +28,146 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -1 BITMAP "res/Clubs_Ace.bmp" -2 BITMAP "res/Clubs_Two.bmp" -3 BITMAP "res/Clubs_Three.bmp" -4 BITMAP "res/Clubs_Four.bmp" -5 BITMAP "res/Clubs_Five.bmp" -6 BITMAP "res/Clubs_Six.bmp" -7 BITMAP "res/Clubs_Seven.bmp" -8 BITMAP "res/Clubs_Eight.bmp" -9 BITMAP "res/Clubs_Nine.bmp" -10 BITMAP "res/Clubs_Ten.bmp" -11 BITMAP "res/Clubs_Jack.bmp" -12 BITMAP "res/Clubs_Queen.bmp" -13 BITMAP "res/Clubs_King.bmp" -14 BITMAP "res/Diamonds_Ace.bmp" -15 BITMAP "res/Diamonds_Two.bmp" -16 BITMAP "res/Diamonds_Three.bmp" -17 BITMAP "res/Diamonds_Four.bmp" -18 BITMAP "res/Diamonds_Five.bmp" -19 BITMAP "res/Diamonds_Six.bmp" -20 BITMAP "res/Diamonds_Seven.bmp" -21 BITMAP "res/Diamonds_Eight.bmp" -22 BITMAP "res/Diamonds_Nine.bmp" -23 BITMAP "res/Diamonds_Ten.bmp" -24 BITMAP "res/Diamonds_Jack.bmp" -25 BITMAP "res/Diamonds_Queen.bmp" -26 BITMAP "res/Diamonds_King.bmp" -27 BITMAP "res/Hearts_Ace.bmp" -28 BITMAP "res/Hearts_Two.bmp" -29 BITMAP "res/Hearts_Three.bmp" -30 BITMAP "res/Hearts_Four.bmp" -31 BITMAP "res/Hearts_Five.bmp" -32 BITMAP "res/Hearts_Six.bmp" -33 BITMAP "res/Hearts_Seven.bmp" -34 BITMAP "res/Hearts_Eight.bmp" -35 BITMAP "res/Hearts_Nine.bmp" -36 BITMAP "res/Hearts_Ten.bmp" -37 BITMAP "res/Hearts_Jack.bmp" -38 BITMAP "res/Hearts_Queen.bmp" -39 BITMAP "res/Hearts_King.bmp" -40 BITMAP "res/Spades_Ace.bmp" -41 BITMAP "res/Spades_Two.bmp" -42 BITMAP "res/Spades_Three.bmp" -43 BITMAP "res/Spades_Four.bmp" -44 BITMAP "res/Spades_Five.bmp" -45 BITMAP "res/Spades_Six.bmp" -46 BITMAP "res/Spades_Seven.bmp" -47 BITMAP "res/Spades_Eight.bmp" -48 BITMAP "res/Spades_Nine.bmp" -49 BITMAP "res/Spades_Ten.bmp" -50 BITMAP "res/Spades_Jack.bmp" -51 BITMAP "res/Spades_Queen.bmp" -52 BITMAP "res/Spades_King.bmp" -53 BITMAP "res/FreeCard.bmp" -54 BITMAP "res/Background_1.bmp" -55 BITMAP "res/Background_2.bmp" -56 BITMAP "res/Background_3.bmp" -57 BITMAP "res/Background_4.bmp" -58 BITMAP "res/Background_5.bmp" -59 BITMAP "res/Background_6.bmp" -60 BITMAP "res/Background_7.bmp" -61 BITMAP "res/Background_8.bmp" -62 BITMAP "res/Background_9.bmp" -63 BITMAP "res/Background_10.bmp" -64 BITMAP "res/Background_11.bmp" -65 BITMAP "res/Background_12.bmp" -66 BITMAP "res/Joker.bmp" -67 BITMAP "res/XSign.bmp" -68 BITMAP "res/OSign.bmp" +#if defined(CARDSTYLE_DEFAULT) + 1 BITMAP "res/default/Clubs_Ace.bmp" + 2 BITMAP "res/default/Clubs_Two.bmp" + 3 BITMAP "res/default/Clubs_Three.bmp" + 4 BITMAP "res/default/Clubs_Four.bmp" + 5 BITMAP "res/default/Clubs_Five.bmp" + 6 BITMAP "res/default/Clubs_Six.bmp" + 7 BITMAP "res/default/Clubs_Seven.bmp" + 8 BITMAP "res/default/Clubs_Eight.bmp" + 9 BITMAP "res/default/Clubs_Nine.bmp" + 10 BITMAP "res/default/Clubs_Ten.bmp" + 11 BITMAP "res/default/Clubs_Jack.bmp" + 12 BITMAP "res/default/Clubs_Queen.bmp" + 13 BITMAP "res/default/Clubs_King.bmp" + 14 BITMAP "res/default/Diamonds_Ace.bmp" + 15 BITMAP "res/default/Diamonds_Two.bmp" + 16 BITMAP "res/default/Diamonds_Three.bmp" + 17 BITMAP "res/default/Diamonds_Four.bmp" + 18 BITMAP "res/default/Diamonds_Five.bmp" + 19 BITMAP "res/default/Diamonds_Six.bmp" + 20 BITMAP "res/default/Diamonds_Seven.bmp" + 21 BITMAP "res/default/Diamonds_Eight.bmp" + 22 BITMAP "res/default/Diamonds_Nine.bmp" + 23 BITMAP "res/default/Diamonds_Ten.bmp" + 24 BITMAP "res/default/Diamonds_Jack.bmp" + 25 BITMAP "res/default/Diamonds_Queen.bmp" + 26 BITMAP "res/default/Diamonds_King.bmp" + 27 BITMAP "res/default/Hearts_Ace.bmp" + 28 BITMAP "res/default/Hearts_Two.bmp" + 29 BITMAP "res/default/Hearts_Three.bmp" + 30 BITMAP "res/default/Hearts_Four.bmp" + 31 BITMAP "res/default/Hearts_Five.bmp" + 32 BITMAP "res/default/Hearts_Six.bmp" + 33 BITMAP "res/default/Hearts_Seven.bmp" + 34 BITMAP "res/default/Hearts_Eight.bmp" + 35 BITMAP "res/default/Hearts_Nine.bmp" + 36 BITMAP "res/default/Hearts_Ten.bmp" + 37 BITMAP "res/default/Hearts_Jack.bmp" + 38 BITMAP "res/default/Hearts_Queen.bmp" + 39 BITMAP "res/default/Hearts_King.bmp" + 40 BITMAP "res/default/Spades_Ace.bmp" + 41 BITMAP "res/default/Spades_Two.bmp" + 42 BITMAP "res/default/Spades_Three.bmp" + 43 BITMAP "res/default/Spades_Four.bmp" + 44 BITMAP "res/default/Spades_Five.bmp" + 45 BITMAP "res/default/Spades_Six.bmp" + 46 BITMAP "res/default/Spades_Seven.bmp" + 47 BITMAP "res/default/Spades_Eight.bmp" + 48 BITMAP "res/default/Spades_Nine.bmp" + 49 BITMAP "res/default/Spades_Ten.bmp" + 50 BITMAP "res/default/Spades_Jack.bmp" + 51 BITMAP "res/default/Spades_Queen.bmp" + 52 BITMAP "res/default/Spades_King.bmp" + 53 BITMAP "res/default/FreeCard.bmp" + 54 BITMAP "res/default/Background_1.bmp" + 55 BITMAP "res/default/Background_2.bmp" + 56 BITMAP "res/default/Background_3.bmp" + 57 BITMAP "res/default/Background_4.bmp" + 58 BITMAP "res/default/Background_5.bmp" + 59 BITMAP "res/default/Background_6.bmp" + 60 BITMAP "res/default/Background_7.bmp" + 61 BITMAP "res/default/Background_8.bmp" + 62 BITMAP "res/default/Background_9.bmp" + 63 BITMAP "res/default/Background_10.bmp" + 64 BITMAP "res/default/Background_11.bmp" + 65 BITMAP "res/default/Background_12.bmp" + 66 BITMAP "res/default/Joker.bmp" + 67 BITMAP "res/default/XSign.bmp" + 68 BITMAP "res/default/OSign.bmp" + +#elif defined(CARDSTYLE_BAVARIAN) + 1 BITMAP "res/bavarian/EichelAs.bmp" + 2 BITMAP "res/bavarian/Eichel2.bmp" + 3 BITMAP "res/bavarian/Eichel3.bmp" + 4 BITMAP "res/bavarian/Eichel4.bmp" + 5 BITMAP "res/bavarian/Eichel5.bmp" + 6 BITMAP "res/bavarian/Eichel6.bmp" + 7 BITMAP "res/bavarian/Eichel7.bmp" + 8 BITMAP "res/bavarian/Eichel8.bmp" + 9 BITMAP "res/bavarian/Eichel9.bmp" + 10 BITMAP "res/bavarian/Eichel10.bmp" + 11 BITMAP "res/bavarian/EichelUnter.bmp" + 12 BITMAP "res/bavarian/EichelOber.bmp" + 13 BITMAP "res/bavarian/EichelKoenig.bmp" + 14 BITMAP "res/bavarian/SchellenAs.bmp" + 15 BITMAP "res/bavarian/Schellen2.bmp" + 16 BITMAP "res/bavarian/Schellen3.bmp" + 17 BITMAP "res/bavarian/Schellen4.bmp" + 18 BITMAP "res/bavarian/Schellen5.bmp" + 19 BITMAP "res/bavarian/Schellen6.bmp" + 20 BITMAP "res/bavarian/Schellen7.bmp" + 21 BITMAP "res/bavarian/Schellen8.bmp" + 22 BITMAP "res/bavarian/Schellen9.bmp" + 23 BITMAP "res/bavarian/Schellen10.bmp" + 24 BITMAP "res/bavarian/SchellenUnter.bmp" + 25 BITMAP "res/bavarian/SchellenOber.bmp" + 26 BITMAP "res/bavarian/SchellenKoenig.bmp" + 27 BITMAP "res/bavarian/HerzAs.bmp" + 28 BITMAP "res/bavarian/Herz2.bmp" + 29 BITMAP "res/bavarian/Herz3.bmp" + 30 BITMAP "res/bavarian/Herz4.bmp" + 31 BITMAP "res/bavarian/Herz5.bmp" + 32 BITMAP "res/bavarian/Herz6.bmp" + 33 BITMAP "res/bavarian/Herz7.bmp" + 34 BITMAP "res/bavarian/Herz8.bmp" + 35 BITMAP "res/bavarian/Herz9.bmp" + 36 BITMAP "res/bavarian/Herz10.bmp" + 37 BITMAP "res/bavarian/HerzUnter.bmp" + 38 BITMAP "res/bavarian/HerzOber.bmp" + 39 BITMAP "res/bavarian/HerzKoenig.bmp" + 40 BITMAP "res/bavarian/GrasAs.bmp" + 41 BITMAP "res/bavarian/Gras2.bmp" + 42 BITMAP "res/bavarian/Gras3.bmp" + 43 BITMAP "res/bavarian/Gras4.bmp" + 44 BITMAP "res/bavarian/Gras5.bmp" + 45 BITMAP "res/bavarian/Gras6.bmp" + 46 BITMAP "res/bavarian/Gras7.bmp" + 47 BITMAP "res/bavarian/Gras8.bmp" + 48 BITMAP "res/bavarian/Gras9.bmp" + 49 BITMAP "res/bavarian/Gras10.bmp" + 50 BITMAP "res/bavarian/GrasUnter.bmp" + 51 BITMAP "res/bavarian/GrasOber.bmp" + 52 BITMAP "res/bavarian/GrasKoenig.bmp" + 53 BITMAP "res/bavarian/FreeCard.bmp" + 54 BITMAP "res/bavarian/Ruecken.bmp" + 55 BITMAP "res/bavarian/Ruecken.bmp" + 56 BITMAP "res/bavarian/Ruecken.bmp" + 57 BITMAP "res/bavarian/Ruecken.bmp" + 58 BITMAP "res/bavarian/Ruecken.bmp" + 59 BITMAP "res/bavarian/Ruecken.bmp" + 60 BITMAP "res/bavarian/Ruecken.bmp" + 61 BITMAP "res/bavarian/Ruecken.bmp" + 62 BITMAP "res/bavarian/Ruecken.bmp" + 63 BITMAP "res/bavarian/Ruecken.bmp" + 64 BITMAP "res/bavarian/Ruecken.bmp" + 65 BITMAP "res/bavarian/Ruecken.bmp" + 66 BITMAP "res/bavarian/Joker.bmp" + 67 BITMAP "res/bavarian/XSign.bmp" + 68 BITMAP "res/bavarian/OSign.bmp" + +#else +# error No or unsupported cardstyle defined +#endif Removed: trunk/reactos/dll/win32/cards/res/Background_1.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Background_10.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Background_11.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Background_12.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Background_2.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Background_3.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Background_4.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Background_5.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Background_6.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Background_7.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Background_8.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Background_9.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Clubs_Ace.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Clubs_… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Clubs_Eight.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Clubs_… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Clubs_Five.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Clubs_… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Clubs_Four.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Clubs_… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Clubs_Jack.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Clubs_… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Clubs_King.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Clubs_… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Clubs_Nine.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Clubs_… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Clubs_Queen.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Clubs_… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Clubs_Seven.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Clubs_… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Clubs_Six.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Clubs_… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Clubs_Ten.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Clubs_… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Clubs_Three.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Clubs_… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Clubs_Two.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Clubs_… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Diamonds_Ace.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Diamon… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Diamonds_Eight.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Diamon… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Diamonds_Five.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Diamon… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Diamonds_Four.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Diamon… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Diamonds_Jack.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Diamon… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Diamonds_King.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Diamon… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Diamonds_Nine.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Diamon… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Diamonds_Queen.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Diamon… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Diamonds_Seven.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Diamon… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Diamonds_Six.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Diamon… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Diamonds_Ten.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Diamon… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Diamonds_Three.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Diamon… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Diamonds_Two.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Diamon… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/FreeCard.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/FreeCa… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Hearts_Ace.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Hearts… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Hearts_Eight.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Hearts… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Hearts_Five.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Hearts… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Hearts_Four.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Hearts… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Hearts_Jack.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Hearts… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Hearts_King.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Hearts… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Hearts_Nine.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Hearts… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Hearts_Queen.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Hearts… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Hearts_Seven.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Hearts… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Hearts_Six.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Hearts… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Hearts_Ten.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Hearts… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Hearts_Three.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Hearts… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Hearts_Two.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Hearts… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Joker.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Joker.… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/OSign.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/OSign.… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Spades_Ace.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Spades… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Spades_Eight.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Spades… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Spades_Five.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Spades… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Spades_Four.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Spades… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Spades_Jack.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Spades… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Spades_King.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Spades… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Spades_Nine.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Spades… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Spades_Queen.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Spades… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Spades_Seven.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Spades… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Spades_Six.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Spades… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Spades_Ten.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Spades… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Spades_Three.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Spades… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Spades_Two.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Spades… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/XSign.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/XSign.… ============================================================================== Binary file - no diff available. Modified: trunk/rosapps/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=29630… ============================================================================== --- trunk/rosapps/directory.rbuild (original) +++ trunk/rosapps/directory.rbuild Tue Oct 16 22:33:03 2007 @@ -6,10 +6,6 @@ <xi:include href="avtest/avtest.rbuild" /> </directory> --> - - <directory name="cardsbav"> - <xi:include href="cardsbav/cardsbav.rbuild" /> - </directory> <directory name="cmdutils"> <xi:include href="cmdutils/cmdutils.rbuild" />

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
71
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 October 2007