Author: dreimer
Date: Mon Aug 4 14:26:51 2014
New Revision: 63800
URL: http://svn.reactos.org/svn/reactos?rev=63800&view=rev
Log:
[CARDS]
Added the first results of my odyssey finding out where the original french cards are from + the known facts regarding the bavarian ones.
Bavarian:
Add the ReactOS Logo into the Bavarian Layout, too.
Remove ugly scanned background 11 and put the former Nr 1 there.
Added a frame around background 12.
French:
Added a frame around background 6.
Added:
trunk/reactos/dll/win32/cards/COPYING (with props)
Modified:
trunk/reactos/dll/win32/cards/res/bavarian/Ruecken1.bmp
trunk/reactos/dll/win32/cards/res/bavarian/Ruecken11.bmp
trunk/reactos/dll/win32/cards/res/bavarian/Ruecken12.bmp
trunk/reactos/dll/win32/cards/res/bavarian/Ruecken3.bmp
trunk/reactos/dll/win32/cards/res/bavarian/Ruecken4.bmp
trunk/reactos/dll/win32/cards/res/bavarian/Ruecken6.bmp
trunk/reactos/dll/win32/cards/res/bavarian/Ruecken8.bmp
trunk/reactos/dll/win32/cards/res/default/Background_6.bmp
Added: trunk/reactos/dll/win32/cards/COPYING
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/COPYING?re…
==============================================================================
--- trunk/reactos/dll/win32/cards/COPYING (added)
+++ trunk/reactos/dll/win32/cards/COPYING [iso-8859-1] Mon Aug 4 14:26:51 2014
@@ -0,0 +1,51 @@
+French front sides:
+
+Source:
+http://www.united3dartists.com/forum/viewtopic.php?f=31&t=954
+
+License:
+After contacting DesignDevil by Forum PM, he answered:
+"There are no restrictions from my side in the use and exploitation of the
+graphics, private and / or commercial. Naming me is also not necessary."
+
+The completely redefined 52 cards are based on a scanned original card game
+which is based on the original illustration made in 1776 in Straßbourg in object
+placement matters.
+
+French back sides:
+
+Background_1: Our own logo.
+Background_2: Based on a French Tournament illustration.
+Background_3:
+Background_4:
+Background_5:
+Background_6: Illustration by DesignDevil. Source see above.
+Background_7:
+Background_8:
+Background_9:
+Background_10: Based on one of the more common french Romme card game backgrounds.
+Background_11:
+Background_12:
+
+-------------------------------------------------------------------------------
+
+Bavarian front sides:
+
+Based on the typical modern bavarian 36 card illustration from 1810. The non
+existent 16 cards number 2-5 in all four colours were scrapped in the 17.
+century and thus were hand made by me. (Daniel Reimer).
+
+Bavarian back sides:
+
+Ruecken1: Our own logo.
+Ruecken2: Based on the historical "Altenburger Bild" mainly found in Thuringia, Saxony and Saxony-Anhalt.
+Ruecken3: Based on the historical "Tarock Bild" mainly found in Bavaria.
+Ruecken4: Based on the historical "Gaigel Binokel Bild" mainly found in Baden-Württemberg.
+Ruecken5: Based on one of the more common french Skat card game backgrounds.
+Ruecken6: Based on the bavarian flag. Can be found that way around Munich.
+Ruecken7: Typical diamond pattern found on many old and new Skat and "Kurze Scharfe" cards.
+Ruecken8: Based on the historical "Gaigel Binokel Bild" mainly found in Bavaria.
+Ruecken9: Typical diamond pattern found on many old and new Skat and "Kurze Scharfe" cards.
+Ruecken10: Typical diamond pattern found on many old and new Skat and "Kurze Scharfe" cards.
+Ruecken11: Based on one of the more common french Skat card game backgrounds.
+Ruecken12: Based on the historical "Schafkopf Bild" mainly found in Bavaria.
Propchange: trunk/reactos/dll/win32/cards/COPYING
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken1.bmp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari…
==============================================================================
Binary files - no diff available.
Modified: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken11.bmp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari…
==============================================================================
Binary files - no diff available.
Modified: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken12.bmp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari…
==============================================================================
Binary files - no diff available.
Modified: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken3.bmp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari…
==============================================================================
Binary files - no diff available.
Modified: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken4.bmp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari…
==============================================================================
Binary files - no diff available.
Modified: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken6.bmp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari…
==============================================================================
Binary files - no diff available.
Modified: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken8.bmp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari…
==============================================================================
Binary files - no diff available.
Modified: trunk/reactos/dll/win32/cards/res/default/Background_6.bmp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul…
==============================================================================
Binary files - no diff available.
Author: cwittich
Date: Sun Aug 3 05:38:37 2014
New Revision: 63796
URL: http://svn.reactos.org/svn/reactos?rev=63796&view=rev
Log:
user32: Make GetRegisteredRawInputDevices hotpatchable.
Steam tries to hook this function and crashes without DECLSPEC_HOTPATCH.
See http://bugs.winehq.org/show_bug.cgi?id=35361#c48
patch by Stefan Dösinger stefan(a)codeweavers.com
Modified:
trunk/reactos/win32ss/user/user32/misc/stubs.c
Modified: trunk/reactos/win32ss/user/user32/misc/stubs.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/s…
==============================================================================
--- trunk/reactos/win32ss/user/user32/misc/stubs.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/misc/stubs.c [iso-8859-1] Sun Aug 3 05:38:37 2014
@@ -346,6 +346,7 @@
*/
UINT
WINAPI
+DECLSPEC_HOTPATCH
GetRegisteredRawInputDevices(
PRAWINPUTDEVICE pRawInputDevices,
PUINT puiNumDevices,
Author: hbelusca
Date: Fri Aug 1 19:03:50 2014
New Revision: 63795
URL: http://svn.reactos.org/svn/reactos?rev=63795&view=rev
Log:
[KERNEL32]
Hack buffer protection check for pInputControl and lpBuffer user buffers.
Modified:
branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c
Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c
URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke…
==============================================================================
--- branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] (original)
+++ branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] Fri Aug 1 19:03:50 2014
@@ -126,42 +126,53 @@
* "This parameter requires Unicode input by default.
* For ANSI mode, set this parameter to NULL."
*/
- if (bUnicode && pInputControl &&
- pInputControl->nLength == sizeof(CONSOLE_READCONSOLE_CONTROL))
- {
- /* Sanity check */
- if (pInputControl->nInitialChars <= nNumberOfCharsToRead)
- {
- ReadConsoleRequest->InitialNumBytes =
- pInputControl->nInitialChars * sizeof(WCHAR); // CharSize
-
- if (pInputControl->nInitialChars != 0)
+ _SEH2_TRY
+ {
+ if (bUnicode && pInputControl &&
+ pInputControl->nLength == sizeof(CONSOLE_READCONSOLE_CONTROL))
+ {
+ /* Sanity check */
+ if (pInputControl->nInitialChars <= nNumberOfCharsToRead)
{
- /*
- * It is possible here to overwrite the static buffer, in case
- * the number of bytes to read was smaller than the static buffer.
- * In this case, this means we are continuing a pending read,
- * and we do not need in fact the executable name that was
- * stored in the static buffer because it was first grabbed when
- * we started the first read.
- */
- RtlCopyMemory(ReadConsoleRequest->Buffer,
- lpBuffer,
- ReadConsoleRequest->InitialNumBytes);
+ ReadConsoleRequest->InitialNumBytes =
+ pInputControl->nInitialChars * sizeof(WCHAR); // CharSize
+
+ if (pInputControl->nInitialChars != 0)
+ {
+ /*
+ * It is possible here to overwrite the static buffer, in case
+ * the number of bytes to read was smaller than the static buffer.
+ * In this case, this means we are continuing a pending read,
+ * and we do not need in fact the executable name that was
+ * stored in the static buffer because it was first grabbed when
+ * we started the first read.
+ */
+ RtlCopyMemory(ReadConsoleRequest->Buffer,
+ lpBuffer,
+ ReadConsoleRequest->InitialNumBytes);
+ }
+
+ ReadConsoleRequest->CtrlWakeupMask = pInputControl->dwCtrlWakeupMask;
}
-
- ReadConsoleRequest->CtrlWakeupMask = pInputControl->dwCtrlWakeupMask;
+ else
+ {
+ // Status = STATUS_INVALID_PARAMETER;
+ }
}
else
{
- // Status = STATUS_INVALID_PARAMETER;
- }
- }
- else
- {
- /* We are in a situation where pInputControl has no meaning */
- pInputControl = NULL;
- }
+ /* We are in a situation where pInputControl has no meaning */
+ pInputControl = NULL;
+ }
+ }
+ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+ {
+ // HACK
+ if (CaptureBuffer) CsrFreeCaptureBuffer(CaptureBuffer);
+ SetLastError(ERROR_INVALID_ACCESS);
+ return FALSE;
+ }
+ _SEH2_END;
/* Check for sanity */
/*