Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[dgorbachev] 38710: - Fix "Turkish Q" keyboard layout (thanks to user mergulcu from the forum). - Change AltGr behavior for several keyboard layouts (bug #3887). - Change file description for some keyboard layouts. - Other minor changes.
by dgorbachev＠svn.reactos.org 11 Jan '09

11 Jan '09

Author: dgorbachev Date: Sun Jan 11 13:09:25 2009 New Revision: 38710 URL: http://svn.reactos.org/svn/reactos?rev=38710&view=rev Log: - Fix "Turkish Q" keyboard layout (thanks to user mergulcu from the forum). - Change AltGr behavior for several keyboard layouts (bug #3887). - Change file description for some keyboard layouts. - Other minor changes. Modified: trunk/reactos/dll/keyboard/kbda2/kbda2.c trunk/reactos/dll/keyboard/kbda3/kbda3.c trunk/reactos/dll/keyboard/kbdal/kbdal.c trunk/reactos/dll/keyboard/kbdarme/kbdarme.c trunk/reactos/dll/keyboard/kbdarmw/kbdarmw.c trunk/reactos/dll/keyboard/kbdbga/kbdbga.c trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.c trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.c trunk/reactos/dll/keyboard/kbdbr/kbdbr.c trunk/reactos/dll/keyboard/kbdbur/kbdbur.c trunk/reactos/dll/keyboard/kbdcan/kbdcan.c trunk/reactos/dll/keyboard/kbdcr/kbdcr.c trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.c trunk/reactos/dll/keyboard/kbdda/kbdda.rc trunk/reactos/dll/keyboard/kbddv/kbddv.c trunk/reactos/dll/keyboard/kbdes/kbdes.c trunk/reactos/dll/keyboard/kbdest/kbdest.c trunk/reactos/dll/keyboard/kbdfc/kbdfc.c trunk/reactos/dll/keyboard/kbdfi/kbdfi.c trunk/reactos/dll/keyboard/kbdfr/kbdfr.c trunk/reactos/dll/keyboard/kbdfr/kbdfr.rc trunk/reactos/dll/keyboard/kbdgeo/kbdgeo.c trunk/reactos/dll/keyboard/kbdhe/kbdhe.c trunk/reactos/dll/keyboard/kbdhe/kbdhe.rc trunk/reactos/dll/keyboard/kbdheb/kbdheb.c trunk/reactos/dll/keyboard/kbdheb/kbdheb.rc trunk/reactos/dll/keyboard/kbdhu/kbdhu.c trunk/reactos/dll/keyboard/kbdhu/kbdhu.rc trunk/reactos/dll/keyboard/kbdic/kbdic.c trunk/reactos/dll/keyboard/kbdinasa/kbdinasa.c trunk/reactos/dll/keyboard/kbdinben/kbdinben.c trunk/reactos/dll/keyboard/kbdindev/kbdindev.c trunk/reactos/dll/keyboard/kbdinguj/kbdinguj.c trunk/reactos/dll/keyboard/kbdinmal/kbdinmal.c trunk/reactos/dll/keyboard/kbdir/kbdir.c trunk/reactos/dll/keyboard/kbdit/kbdit.c trunk/reactos/dll/keyboard/kbdja/kbdja.c trunk/reactos/dll/keyboard/kbdkaz/kbdkaz.c trunk/reactos/dll/keyboard/kbdkaz/kbdkaz.rc trunk/reactos/dll/keyboard/kbdko/kbdko.c trunk/reactos/dll/keyboard/kbdla/kbdla.c trunk/reactos/dll/keyboard/kbdlt/kbdlt.c trunk/reactos/dll/keyboard/kbdlv/kbdlv.c trunk/reactos/dll/keyboard/kbdmac/kbdmac.c trunk/reactos/dll/keyboard/kbdne/kbdne.c trunk/reactos/dll/keyboard/kbdno/kbdno.rc trunk/reactos/dll/keyboard/kbdpo/kbdpo.c trunk/reactos/dll/keyboard/kbdro/kbdro.c trunk/reactos/dll/keyboard/kbdru/kbdru.c trunk/reactos/dll/keyboard/kbdsk/kbdsk.c trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.c trunk/reactos/dll/keyboard/kbdsw/kbdsw.c trunk/reactos/dll/keyboard/kbdsw/kbdsw.rc trunk/reactos/dll/keyboard/kbdtat/kbdtat.c trunk/reactos/dll/keyboard/kbdth0/kbdth0.c trunk/reactos/dll/keyboard/kbdth1/kbdth1.c trunk/reactos/dll/keyboard/kbdth2/kbdth2.c trunk/reactos/dll/keyboard/kbdth2/kbdth2.rc trunk/reactos/dll/keyboard/kbdth3/kbdth3.c trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.c trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.c trunk/reactos/dll/keyboard/kbduk/kbduk.c trunk/reactos/dll/keyboard/kbduk/kbduk.rc trunk/reactos/dll/keyboard/kbdur/kbdur.c trunk/reactos/dll/keyboard/kbdurs/kbdurs.c trunk/reactos/dll/keyboard/kbdus/kbdus.rc trunk/reactos/dll/keyboard/kbdusa/kbdusa.c trunk/reactos/dll/keyboard/kbdusl/kbdusl.c trunk/reactos/dll/keyboard/kbdusr/kbdusr.c trunk/reactos/dll/keyboard/kbdusx/kbdusx.c trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.c trunk/reactos/dll/keyboard/kbdycc/kbdycc.c trunk/reactos/dll/keyboard/kbdycl/kbdycl.c Modified: trunk/reactos/dll/keyboard/kbda2/kbda2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbda2/kbda2.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbda2/kbda2.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbda2/kbda2.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -395,7 +395,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures */ 2, Modified: trunk/reactos/dll/keyboard/kbda3/kbda3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbda3/kbda3.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbda3/kbda3.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbda3/kbda3.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -395,7 +395,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures */ 2, Modified: trunk/reactos/dll/keyboard/kbdal/kbdal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdal/kbdal.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdal/kbdal.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdal/kbdal.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -392,9 +392,9 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ - - /* Ligatures -- Russian doesn't have any */ + MAKELONG(1,1), /* Version 1.0 */ + + /* Ligatures -- Albanian doesn't have any */ 0, 0, NULL Modified: trunk/reactos/dll/keyboard/kbdarme/kbdarme.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdarme/kbdar… ============================================================================== --- trunk/reactos/dll/keyboard/kbdarme/kbdarme.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdarme/kbdarme.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -367,7 +367,7 @@ MAKELONG(0,1), /* Version 1.0 */ - /* Ligatures -- Russian doesn't have any */ + /* Ligatures -- Armenian doesn't have any */ 0, 0, NULL Modified: trunk/reactos/dll/keyboard/kbdarmw/kbdarmw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdarmw/kbdar… ============================================================================== --- trunk/reactos/dll/keyboard/kbdarmw/kbdarmw.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdarmw/kbdarmw.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -355,7 +355,7 @@ MAKELONG(0,1), /* Version 1.0 */ - /* Ligatures -- Russian doesn't have any */ + /* Ligatures -- Armenian doesn't have any */ 0, 0, NULL Modified: trunk/reactos/dll/keyboard/kbdbga/kbdbga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbga/kbdbga… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbga/kbdbga.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdbga/kbdbga.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,4 +1,5 @@ /* + * Arda - Bulgarian keyboard layout * Àðäà -Áúëãàðñêà êëàâèàòóðíà ïîäðåäáà '÷øåðòú' çà ÐåàêòÎÑ * Copyright (C) 2007 ReactOS * License: LGPL, see: LGPL.txt @@ -165,7 +166,7 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, 3, - { 0, 1, 2, 3, 0, 0, 0xC0 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ + { 0, 1, 2, 3 } }; #define NOCAPS 0 @@ -396,7 +397,7 @@ MAKELONG(0,1), /* Version 1.0 */ - /* Ligatures -- */ + /* Ligatures -- Bulgarian doesn't have any */ 0, 0, NULL Modified: trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbgm/kbdbgm… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,4 +1,5 @@ /* + * Maritsa - Bulgarian keyboard layout * Ìàðèöà - Áúëãàðñêà êëàâèàòóðíà ïîäðåäáà ïî ÁÄÑ 5237-78 çà ÐåàêòÎÑ * Copyright (C) 2007 ReactOS * License: LGPL, see: LGPL.txt @@ -165,7 +166,7 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, 3, - { 0, 1, 2, 3, 0, 0, 0xC0 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ + { 0, 1, 2, 3 } }; #define NOCAPS 0 @@ -397,7 +398,7 @@ MAKELONG(0,1), /* Version 1.0 */ - /* Ligatures -- Russian doesn't have any */ + /* Ligatures -- Bulgarian doesn't have any */ 0, 0, NULL Modified: trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbgt/kbdbgt… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,4 +1,5 @@ /* + * Tundzha - Bulgarian keyboard layout * Òóíäæà - Áúëãàðñêà êëàâèàòóðíà ïîçâóêîâà ïîäðåäáà 'ÿâåðòú' çà ÐåàêòÎÑ * Copyright (C) 2007 ReactOS * License: LGPL, see: LGPL.txt @@ -405,7 +406,7 @@ /* Key names */ (VSC_LPWSTR *)key_names, (VSC_LPWSTR *)extended_key_names, -// dead_key_names, /* Dead key names */ + // dead_key_names, /* Dead key names */ NULL, /* Dead key names */ /* scan code to virtual key maps */ @@ -414,9 +415,9 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ - - /* Ligatures -- */ + MAKELONG(1,1), /* Version 1.0 */ + + /* Ligatures -- Bulgarian doesn't have any */ 0, 0, NULL Modified: trunk/reactos/dll/keyboard/kbdbr/kbdbr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbr/kbdbr.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbr/kbdbr.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdbr/kbdbr.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -453,7 +453,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures */ 0, Modified: trunk/reactos/dll/keyboard/kbdbur/kbdbur.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbur/kbdbur… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbur/kbdbur.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdbur/kbdbur.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -372,7 +372,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures */ 0, Modified: trunk/reactos/dll/keyboard/kbdcan/kbdcan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcan/kbdcan… ============================================================================== --- trunk/reactos/dll/keyboard/kbdcan/kbdcan.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdcan/kbdcan.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -586,7 +586,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ 0, 0, Modified: trunk/reactos/dll/keyboard/kbdcr/kbdcr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcr/kbdcr.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdcr/kbdcr.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdcr/kbdcr.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -500,9 +500,9 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ - - /* Ligatures -- Russian doesn't have any */ + MAKELONG(1,1), /* Version 1.0 */ + + /* Ligatures -- Croatian doesn't have any */ 0, 0, NULL Modified: trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcz1/kbdcz1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -31,6 +31,8 @@ #define KNUMP 0x800 /* Number-pad */ #define KNUMS 0xc00 /* Special + number pad */ #define KMEXT 0x300 /* Multi + ext */ + +#define SHFT_INVALID 0x0F ROSDATA USHORT scancode_to_vk[] = { /* Numbers Row */ @@ -124,7 +126,8 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, 7, - { 0, 1, 2, 0,0, 0,3,0} /* Modifier bit order, NONE, SHIFT, CTRL, SHIFT+CTRL,ALT(not used),SHIFT-ALT (not used), CTR+ALT, SHIFT-CTRL-ALT*/ + { 0, 1, 2, 0, 0, 0, 3, 0 } + /* Modifier bit order: NONE, SHIFT, CTRL, SHIFT-CTRL, ALT (not used), SHIFT-ALT (not used), CTRL-ALT, SHIFT-CTRL-ALT */ }; #define NOCAPS 0 @@ -405,7 +408,7 @@ extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures -- Czech keyboard doesn't have any */ 0, Modified: trunk/reactos/dll/keyboard/kbdda/kbdda.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdda/kbdda.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdda/kbdda.rc [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdda/kbdda.rc [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS DAAscii Keyboard Layout\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Danish Keyboard Layout\0" #define REACTOS_STR_INTERNAL_NAME "kbdda\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdda.dll\0" #include <reactos/version.rc> Modified: trunk/reactos/dll/keyboard/kbddv/kbddv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbddv/kbddv.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbddv/kbddv.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbddv/kbddv.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ /* - * ReactOS USASCII Keyboard layout + * ReactOS US Dvorak keyboard layout * Copyright (C) 2003 ReactOS * License: LGPL, see: LGPL.txt * Modified: trunk/reactos/dll/keyboard/kbdes/kbdes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdes/kbdes.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdes/kbdes.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdes/kbdes.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ /* - * ReactOS ESASCII Keyboard layout + * ReactOS Spanish Keyboard Layout * Copyright (C) 2003 ReactOS * License: LGPL, see: LGPL.txt * Created by HUMA2000 from kbdus, kbdgr, kbdda and kbdfr @@ -524,7 +524,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures -- Spanish doesn't have any */ 0, Modified: trunk/reactos/dll/keyboard/kbdest/kbdest.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdest/kbdest… ============================================================================== --- trunk/reactos/dll/keyboard/kbdest/kbdest.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdest/kbdest.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -447,7 +447,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ 0, 0, Modified: trunk/reactos/dll/keyboard/kbdfc/kbdfc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdfc/kbdfc.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdfc/kbdfc.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdfc/kbdfc.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -464,7 +464,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ 0, 0, Modified: trunk/reactos/dll/keyboard/kbdfi/kbdfi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdfi/kbdfi.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdfi/kbdfi.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdfi/kbdfi.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -463,7 +463,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0, 1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures */ 0, Modified: trunk/reactos/dll/keyboard/kbdfr/kbdfr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdfr/kbdfr.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdfr/kbdfr.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdfr/kbdfr.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,9 +1,9 @@ /* - * ReactOS FRASCII Keyboard layout + * ReactOS French keyboard layout * Copyright (C) 2003 ReactOS * License: LGPL, see: LGPL.txt - * autor: Jean-Michel Gay 2003 - * Pierre Schweitzer 2007 + * Autors: Jean-Michel Gay, 2003 + * Pierre Schweitzer, 2007 * */ @@ -31,6 +31,8 @@ #define KNUMP 0x800 /* Number-pad */ #define KNUMS 0xc00 /* Special + number pad */ #define KMEXT 0x300 /* Multi + ext */ + +#define SHFT_INVALID 0x0F /** * FIXME : - VK_DIVIDE produces ! instead of / @@ -167,9 +169,8 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, 6, - { 0, 1, 2, 4,15,15,3 } - /* new: Modifier bit order, NONE, SHIFT, CTRL, ALT , ? ,? , shift+control*/ - /* old: Modifier bit order, NONE, SHIFT, CTRL, ALT */ + { 0, 1, 2, 4, SHFT_INVALID, SHFT_INVALID, 3 } + /* Modifier bit order: NONE, SHIFT, CTRL, ALT, ?, ?, SHIFT-CTRL */ }; #define NOCAPS 0 @@ -462,7 +463,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures -- French doesn't have any */ 0, Modified: trunk/reactos/dll/keyboard/kbdfr/kbdfr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdfr/kbdfr.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdfr/kbdfr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdfr/kbdfr.rc [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS FRAscii Keyboard Layout\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS French Keyboard Layout\0" #define REACTOS_STR_INTERNAL_NAME "kbdfr\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdfr.dll\0" #include <reactos/version.rc> Modified: trunk/reactos/dll/keyboard/kbdgeo/kbdgeo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdgeo/kbdgeo… ============================================================================== --- trunk/reactos/dll/keyboard/kbdgeo/kbdgeo.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdgeo/kbdgeo.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -370,9 +370,9 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ - - /* Ligatures -- Russian doesn't have any */ + MAKELONG(1,1), /* Version 1.0 */ + + /* Ligatures -- Georgian doesn't have any */ 0, 0, NULL Modified: trunk/reactos/dll/keyboard/kbdhe/kbdhe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdhe/kbdhe.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdhe/kbdhe.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdhe/kbdhe.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -361,8 +361,7 @@ vk_to_wchar_master_table, /* diacritical marks -- currently implemented by wine code */ - /* English doesn't have any, anyway */ - deadkey, + deadkey, /* Key names */ (VSC_LPWSTR *)key_names, Modified: trunk/reactos/dll/keyboard/kbdhe/kbdhe.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdhe/kbdhe.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdhe/kbdhe.rc [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdhe/kbdhe.rc [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Greek Ascii Keyboard Layout\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Greek Keyboard Layout\0" #define REACTOS_STR_INTERNAL_NAME "kbdhe\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdhe.dll\0" #include <reactos/version.rc> Modified: trunk/reactos/dll/keyboard/kbdheb/kbdheb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdheb/kbdheb… ============================================================================== --- trunk/reactos/dll/keyboard/kbdheb/kbdheb.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdheb/kbdheb.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -448,7 +448,6 @@ vk_to_wchar_master_table, /* diacritical marks -- currently implemented by wine code */ - /* English doesn't have any, anyway */ NULL, /* Key names */ @@ -464,7 +463,7 @@ MAKELONG(0,1), /* Version 1.0 */ - /* Ligatures -- does Hebrew have any? */ + /* Ligatures -- Hebrew doesn't have any */ 0, 0, NULL Modified: trunk/reactos/dll/keyboard/kbdheb/kbdheb.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdheb/kbdheb… ============================================================================== --- trunk/reactos/dll/keyboard/kbdheb/kbdheb.rc [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdheb/kbdheb.rc [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Hebrew Ascii Keyboard Layout\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Hebrew Keyboard Layout\0" #define REACTOS_STR_INTERNAL_NAME "kbdheb\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdheb.dll\0" #include <reactos/version.rc> Modified: trunk/reactos/dll/keyboard/kbdhu/kbdhu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdhu/kbdhu.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdhu/kbdhu.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdhu/kbdhu.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ /* - * ReactOS HUASCII Keyboard layout + * ReactOS Hungarian keyboard layout * Copyright (C) 2003 ReactOS * License: LGPL, see: LGPL.txt * @@ -329,7 +329,6 @@ vk_to_wchar_master_table, /* diacritical marks -- currently implemented by wine code */ - /* English doesn't have any, anyway */ NULL, /* Key names */ @@ -345,7 +344,7 @@ MAKELONG(0,1), /* Version 1.0 */ - /* Ligatures -- English doesn't have any */ + /* Ligatures -- Hungarian doesn't have any */ 0, 0, NULL Modified: trunk/reactos/dll/keyboard/kbdhu/kbdhu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdhu/kbdhu.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdhu/kbdhu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdhu/kbdhu.rc [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS HUAscii Keyboard Layout\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Hungarian Keyboard Layout\0" #define REACTOS_STR_INTERNAL_NAME "kbdhu\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdhu.dll\0" #include <reactos/version.rc> Modified: trunk/reactos/dll/keyboard/kbdic/kbdic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdic/kbdic.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdic/kbdic.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdic/kbdic.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -454,9 +454,9 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ - - /* Ligatures -- Russian doesn't have any */ + MAKELONG(1,1), /* Version 1.0 */ + + /* Ligatures -- Icelandic doesn't have any */ 0, 0, NULL Modified: trunk/reactos/dll/keyboard/kbdinasa/kbdinasa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinasa/kbdi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdinasa/kbdinasa.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdinasa/kbdinasa.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -391,7 +391,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures */ 3, Modified: trunk/reactos/dll/keyboard/kbdinben/kbdinben.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinben/kbdi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdinben/kbdinben.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdinben/kbdinben.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -386,7 +386,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures */ 3, Modified: trunk/reactos/dll/keyboard/kbdindev/kbdindev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdindev/kbdi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdindev/kbdindev.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdindev/kbdindev.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -391,7 +391,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures */ 3, Modified: trunk/reactos/dll/keyboard/kbdinguj/kbdinguj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinguj/kbdi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdinguj/kbdinguj.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdinguj/kbdinguj.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -391,7 +391,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures */ 3, Modified: trunk/reactos/dll/keyboard/kbdinmal/kbdinmal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinmal/kbdi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdinmal/kbdinmal.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdinmal/kbdinmal.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -387,7 +387,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures */ 3, Modified: trunk/reactos/dll/keyboard/kbdir/kbdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdir/kbdir.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdir/kbdir.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdir/kbdir.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -419,7 +419,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures */ 0, Modified: trunk/reactos/dll/keyboard/kbdit/kbdit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdit/kbdit.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdit/kbdit.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdit/kbdit.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -183,7 +183,7 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, 6, - { 0, 1, 2, 4, SHFT_INVALID, SHFT_INVALID, 3 } + { 0, 1, 2, 4, SHFT_INVALID, SHFT_INVALID, 3 } }; #define NOCAPS 0 @@ -403,7 +403,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures */ 0, Modified: trunk/reactos/dll/keyboard/kbdja/kbdja.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdja/kbdja.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdja/kbdja.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdja/kbdja.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ /* - * ReactOS USASCII Keyboard layout + * ReactOS Japanese (JIS 106) keyboard layout * Copyright (C) 2003 ReactOS * License: LGPL, see: LGPL.txt * @@ -343,7 +343,6 @@ vk_to_wchar_master_table, /* diacritical marks -- currently implemented by wine code */ - /* English doesn't have any, anyway */ NULL, /* Key names */ @@ -359,7 +358,7 @@ MAKELONG(0,1), /* Version 1.0 */ - /* Ligatures -- English doesn't have any */ + /* Ligatures -- Japanese doesn't have any */ 0, 0, NULL @@ -369,4 +368,3 @@ return &keyboard_layout_table; } - Modified: trunk/reactos/dll/keyboard/kbdkaz/kbdkaz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdkaz/kbdkaz… ============================================================================== --- trunk/reactos/dll/keyboard/kbdkaz/kbdkaz.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdkaz/kbdkaz.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ /* - * ReactOS Kazak (Cyrillic) Keyboard layout + * ReactOS Kazakh (Cyrillic) Keyboard layout * Copyright (C) 2008 ReactOS * Author: Dmitry Chapyshev * License: LGPL, see: LGPL.txt Modified: trunk/reactos/dll/keyboard/kbdkaz/kbdkaz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdkaz/kbdkaz… ============================================================================== --- trunk/reactos/dll/keyboard/kbdkaz/kbdkaz.rc [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdkaz/kbdkaz.rc [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Kazak (Cyrillic) Keyboard Layout\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Kazakh (Cyrillic) Keyboard Layout\0" #define REACTOS_STR_INTERNAL_NAME "kbdkaz\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdkaz.dll\0" #include <reactos/version.rc> Modified: trunk/reactos/dll/keyboard/kbdko/kbdko.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdko/kbdko.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdko/kbdko.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdko/kbdko.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -9,7 +9,7 @@ /* * Important Note / TODO: - * This file is a copy of kbdus.c and needs to adapt to korean + * This file is a copy of kbdus.c and needs to adapt to Korean * keyboard layout! */ @@ -336,7 +336,6 @@ vk_to_wchar_master_table, /* diacritical marks -- currently implemented by wine code */ - /* English doesn't have any, anyway */ NULL, /* Key names */ @@ -352,7 +351,7 @@ MAKELONG(0,1), /* Version 1.0 */ - /* Ligatures -- English doesn't have any */ + /* Ligatures -- Korean doesn't have any */ 0, 0, NULL Modified: trunk/reactos/dll/keyboard/kbdla/kbdla.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdla/kbdla.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdla/kbdla.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdla/kbdla.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -440,7 +440,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures */ 0, Modified: trunk/reactos/dll/keyboard/kbdlt/kbdlt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdlt/kbdlt.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdlt/kbdlt.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdlt/kbdlt.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -381,7 +381,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures -- Lithuanian doesn't have any */ 0, Modified: trunk/reactos/dll/keyboard/kbdlv/kbdlv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdlv/kbdlv.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdlv/kbdlv.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdlv/kbdlv.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -431,7 +431,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures */ 0, Modified: trunk/reactos/dll/keyboard/kbdmac/kbdmac.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdmac/kbdmac… ============================================================================== --- trunk/reactos/dll/keyboard/kbdmac/kbdmac.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdmac/kbdmac.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -376,7 +376,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures */ 0, Modified: trunk/reactos/dll/keyboard/kbdne/kbdne.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdne/kbdne.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdne/kbdne.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdne/kbdne.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -458,7 +458,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures */ 0, Modified: trunk/reactos/dll/keyboard/kbdno/kbdno.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdno/kbdno.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdno/kbdno.rc [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdno/kbdno.rc [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS NOAscii Keyboard Layout\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Norwegian Keyboard Layout\0" #define REACTOS_STR_INTERNAL_NAME "kbdno\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdno.dll\0" #include <reactos/version.rc> Modified: trunk/reactos/dll/keyboard/kbdpo/kbdpo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdpo/kbdpo.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdpo/kbdpo.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdpo/kbdpo.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ /* - * ReactOS POASCII Keyboard layout + * ReactOS Portuguese keyboard layout * Copyright (C) 2006 ReactOS * License: LGPL, see: LGPL.txt * Based on kbdes, skbdda and skbdfr @@ -10,7 +10,7 @@ * http://keytouch.sourceforge.net/howto_keyboard/node4.html (Very Good) * http://www.microsoft.com/globaldev/tools/msklc.mspx (Keyboard layout file from MS) * - *TODO + * TODO * Correct DEADKEYS * Correct DIVIDE and PrtScr */ @@ -223,10 +223,6 @@ }; - - - - #define TIDLE_CIRC VK_OEM_2 #define ACUTE_GRAVE VK_OEM_1 #define ORDERN_SUPERSCRIPT VK_OEM_7 @@ -237,7 +233,6 @@ #define MATH_RELATE VK_OEM_102 - #define ACUTE_CHAR 0xB4 #define GRAVE_CHAR 0x60 #define CIRC_CHAR 0x5E @@ -258,12 +253,8 @@ modifier_keys, 6, { 0, 1<<0, 1<<1, 1<<2, SHFT_INVALID, SHFT_INVALID, 3 } - /* NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, SHIFT+CONTROL */ -}; - - - - + /* NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, SHIFT+CONTROL */ +}; #define NOCAPS 0 @@ -381,12 +372,6 @@ }; - - - - - - #define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { @@ -396,15 +381,6 @@ vk_master(4,key_to_chars_4mod), { 0,0,0 } }; - - - - - - - - - #define DEADTRANS(ch, accent, comp, flags) MAKELONG(ch, accent), comp, flags @@ -476,10 +452,6 @@ { 0, 0, 0} }; - - - - ROSDATA VSC_LPWSTR key_names[] = { @@ -579,10 +551,6 @@ }; - - - - /* Finally, the master table */ ROSDATA KBDTABLES keyboard_layout_table = { @@ -608,7 +576,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures -- Portuguese doesn't have any, that i'm aware */ 0, Modified: trunk/reactos/dll/keyboard/kbdro/kbdro.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdro/kbdro.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdro/kbdro.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdro/kbdro.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -375,7 +375,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures */ 0, Modified: trunk/reactos/dll/keyboard/kbdru/kbdru.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdru/kbdru.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdru/kbdru.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdru/kbdru.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -166,7 +166,7 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, 3, - { 0, 1, 2, 3, 0, 0, 0xC0 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ + { 0, 1, 2, 3 } }; #define NOCAPS 0 Modified: trunk/reactos/dll/keyboard/kbdsk/kbdsk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsk/kbdsk.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsk/kbdsk.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdsk/kbdsk.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -31,6 +31,8 @@ #define KNUMP 0x800 /* Number-pad */ #define KNUMS 0xc00 /* Special + number pad */ #define KMEXT 0x300 /* Multi + ext */ + +#define SHFT_INVALID 0x0F ROSDATA USHORT scancode_to_vk[] = { /* Numbers Row */ @@ -162,7 +164,8 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, 7, - { 0, 1, 2, 0 ,0, 0,3,0} /* Modifier bit order, NONE, SHIFT, CTRL, SHIFT+CTRL,ALT(not used),SHIFT-ALT (not used), CTR+ALT, SHIFT-CTRL-ALT*/ + { 0, 1, 2, 0, 0, 0, 3, 0 } + /* Modifier bit order: NONE, SHIFT, CTRL, SHIFT-CTRL, ALT (not used), SHIFT-ALT (not used), CTRL-ALT, SHIFT-CTRL-ALT */ }; #define NOCAPS 0 @@ -455,7 +458,7 @@ extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures -- Slovak doesn't have any */ 0, Modified: trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsk1/kbdsk1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -31,6 +31,8 @@ #define KNUMP 0x800 /* Number-pad */ #define KNUMS 0xc00 /* Special + number pad */ #define KMEXT 0x300 /* Multi + ext */ + +#define SHFT_INVALID 0x0F ROSDATA USHORT scancode_to_vk[] = { /* Numbers Row */ @@ -162,7 +164,8 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, 7, - { 0, 1, 2, 0 ,0, 0,3,0} /* Modifier bit order, NONE, SHIFT, CTRL, SHIFT+CTRL,ALT(not used),SHIFT-ALT (not used), CTR+ALT, SHIFT-CTRL-ALT*/ + { 0, 1, 2, 0, 0, 0, 3, 0 } + /* Modifier bit order: NONE, SHIFT, CTRL, SHIFT-CTRL, ALT (not used), SHIFT-ALT (not used), CTRL-ALT, SHIFT-CTRL-ALT */ }; #define NOCAPS 0 @@ -455,7 +458,7 @@ extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures -- Slovak doesn't have any */ 0, Modified: trunk/reactos/dll/keyboard/kbdsw/kbdsw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsw/kbdsw.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsw/kbdsw.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdsw/kbdsw.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -470,7 +470,7 @@ MAKELONG(1,1), /* Version 1.0 */ - /* Ligatures -- German doesn't have any */ + /* Ligatures -- Swedish doesn't have any */ 0, 0, NULL Modified: trunk/reactos/dll/keyboard/kbdsw/kbdsw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsw/kbdsw.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsw/kbdsw.rc [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdsw/kbdsw.rc [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS SEAscii Keyboard Layout\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Swedish Keyboard Layout\0" #define REACTOS_STR_INTERNAL_NAME "kbdsw\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdsw.dll\0" #include <reactos/version.rc> Modified: trunk/reactos/dll/keyboard/kbdtat/kbdtat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdtat/kbdtat… ============================================================================== --- trunk/reactos/dll/keyboard/kbdtat/kbdtat.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdtat/kbdtat.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -380,9 +380,9 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ - - /* Ligatures -- Russian doesn't have any */ + MAKELONG(1,1), /* Version 1.0 */ + + /* Ligatures -- Tatar doesn't have any */ 0, 0, NULL Modified: trunk/reactos/dll/keyboard/kbdth0/kbdth0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth0/kbdth0… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth0/kbdth0.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdth0/kbdth0.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -372,7 +372,7 @@ MAKELONG(0,1), /* Version 1.0 */ - /* Ligatures -- Russian doesn't have any */ + /* Ligatures -- Thai doesn't have any */ 0, 0, NULL Modified: trunk/reactos/dll/keyboard/kbdth1/kbdth1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth1/kbdth1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth1/kbdth1.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdth1/kbdth1.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -372,7 +372,7 @@ MAKELONG(0,1), /* Version 1.0 */ - /* Ligatures -- Russian doesn't have any */ + /* Ligatures -- Thai doesn't have any */ 0, 0, NULL Modified: trunk/reactos/dll/keyboard/kbdth2/kbdth2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth2/kbdth2… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth2/kbdth2.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdth2/kbdth2.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ /* - * ReactOS Thai keyboard layout (traditional) + * ReactOS Thai Kedmanee (non-ShiftLock) Keyboard layout * Copyright (C) 2007 ReactOS * License: LGPL, see: LGPL.txt * Modified: trunk/reactos/dll/keyboard/kbdth2/kbdth2.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth2/kbdth2… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth2/kbdth2.rc [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdth2/kbdth2.rc [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Thai Keyboard Layout (traditional)\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Thai Kedmanee (non-ShiftLock) Keyboard Layout\0" #define REACTOS_STR_INTERNAL_NAME "kbdth2\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdth2.dll\0" #include <reactos/version.rc> Modified: trunk/reactos/dll/keyboard/kbdth3/kbdth3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth3/kbdth3… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth3/kbdth3.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdth3/kbdth3.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -372,7 +372,7 @@ MAKELONG(0,1), /* Version 1.0 */ - /* Ligatures -- Russian doesn't have any */ + /* Ligatures -- Thai doesn't have any */ 0, 0, NULL Modified: trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdtuf/kbdtuf… ============================================================================== --- trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -465,7 +465,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures */ 0, Modified: trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdtuq/kbdtuq… ============================================================================== --- trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -195,11 +195,11 @@ { 'B', CAPS, {'b', 'B' } }, { 'N', CAPS, {'n', 'N' } }, { 'M', CAPS, {'m', 'M' } }, - { VK_OEM_2, CAPS, {0x00f6, 0x00d6} }, - { VK_OEM_5, CAPS, {0x00e7, 0x00c7} }, - { VK_OEM_PERIOD, NOCAPS, {'.', ':' } }, + { VK_OEM_COMMA, CAPS, {0x00f6, 0x00d6} }, + { VK_OEM_PERIOD, CAPS, {0x00e7, 0x00c7} }, + { VK_OEM_2, NOCAPS, {'.', ':' } }, { VK_DECIMAL, NOCAPS, {',', ',' } }, - { VK_TAB, NOCAPS, {'\t' ,'\t'} }, + { VK_TAB, NOCAPS, {'\t', '\t' } }, { VK_ADD, NOCAPS, {'+', '+' } }, { VK_DIVIDE, NOCAPS, {'/', '/' } }, { VK_MULTIPLY, NOCAPS, {'*', '*' } }, @@ -232,7 +232,7 @@ { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, 0x00a8, WCH_NONE} }, { VK_OEM_6, CAPS, {0x00fc, 0x00dc, WCH_DEAD, 0x001d } }, { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, '~', WCH_NONE} }, - { VK_OEM_COMMA, NOCAPS, {',', ';', WCH_DEAD, 0x001c } }, + { VK_OEM_5, NOCAPS, {',', ';', WCH_DEAD, 0x001c } }, { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, '`', WCH_NONE} }, { VK_OEM_102, NOCAPS, {'<', '>', '|', 0x001c } }, { VK_BACK, NOCAPS, {'\b', '\b', WCH_NONE, 0x007f } }, @@ -465,7 +465,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures */ 0, Modified: trunk/reactos/dll/keyboard/kbduk/kbduk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbduk/kbduk.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbduk/kbduk.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbduk/kbduk.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ /* - * ReactOS USASCII Keyboard layout + * ReactOS United Kingdom keyboard layout * Copyright (C) 2003 ReactOS * License: LGPL, see: LGPL.txt * @@ -31,6 +31,8 @@ #define KNUMP 0x800 /* Number-pad */ #define KNUMS 0xc00 /* Special + number pad */ #define KMEXT 0x300 /* Multi + ext */ + +#define SHFT_INVALID 0x0F ROSDATA USHORT scancode_to_vk[] = { /* Numbers Row */ @@ -128,7 +130,8 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, 7, - { 0, 1, 2, 3 ,0, 0,4,5} /* Modifier bit order, NONE, SHIFT, CTRL, SHIFT+CTRL,ALT(not used),SHIFT-ALT (not used), CTR+ALT, SHIFT-CTRL-ALT*/ + { 0, 1, 2, 3, 0, 0, 4, 5 } + /* Modifier bit order: NONE, SHIFT, CTRL, SHIFT-CTRL, ALT (not used), SHIFT-ALT (not used), CTRL-ALT, SHIFT-CTRL-ALT */ }; #define NOCAPS 0 @@ -361,7 +364,7 @@ extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures -- English doesn't have any */ 0, Modified: trunk/reactos/dll/keyboard/kbduk/kbduk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbduk/kbduk.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbduk/kbduk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbduk/kbduk.rc [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS UKAscii Keyboard Layout\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS United Kingdom Keyboard Layout\0" #define REACTOS_STR_INTERNAL_NAME "kbduk\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbduk.dll\0" #include <reactos/version.rc> Modified: trunk/reactos/dll/keyboard/kbdur/kbdur.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdur/kbdur.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdur/kbdur.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdur/kbdur.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -166,7 +166,7 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, 3, - { 0, 1, 2, 3, 0, 0, 0xC0 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ + { 0, 1, 2, 3 } }; #define NOCAPS 0 Modified: trunk/reactos/dll/keyboard/kbdurs/kbdurs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdurs/kbdurs… ============================================================================== --- trunk/reactos/dll/keyboard/kbdurs/kbdurs.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdurs/kbdurs.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -166,7 +166,8 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, 7, - { 0, 1, 4, 5, SHFT_INVALID, SHFT_INVALID, 2, 3 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ + { 0, 1, 4, 5, SHFT_INVALID, SHFT_INVALID, 2, 3 } + /* Modifier bit order: NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ }; #define NOCAPS 0 @@ -375,7 +376,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures */ 0, Modified: trunk/reactos/dll/keyboard/kbdus/kbdus.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdus/kbdus.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdus/kbdus.rc [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdus/kbdus.rc [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS USAscii Keyboard Layout\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS United States Keyboard Layout\0" #define REACTOS_STR_INTERNAL_NAME "kbdus\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdus.dll\0" #include <reactos/version.rc> Modified: trunk/reactos/dll/keyboard/kbdusa/kbdusa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusa/kbdusa… ============================================================================== --- trunk/reactos/dll/keyboard/kbdusa/kbdusa.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdusa/kbdusa.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -377,7 +377,7 @@ MAKELONG(0,1), /* Version 1.0 */ - /* Ligatures -- Russian doesn't have any */ + /* Ligatures */ 0, 0, NULL Modified: trunk/reactos/dll/keyboard/kbdusl/kbdusl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusl/kbdusl… ============================================================================== --- trunk/reactos/dll/keyboard/kbdusl/kbdusl.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdusl/kbdusl.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -372,7 +372,7 @@ MAKELONG(0,1), /* Version 1.0 */ - /* Ligatures -- Russian doesn't have any */ + /* Ligatures -- English doesn't have any */ 0, 0, NULL Modified: trunk/reactos/dll/keyboard/kbdusr/kbdusr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusr/kbdusr… ============================================================================== --- trunk/reactos/dll/keyboard/kbdusr/kbdusr.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdusr/kbdusr.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -372,7 +372,7 @@ MAKELONG(0,1), /* Version 1.0 */ - /* Ligatures -- Russian doesn't have any */ + /* Ligatures -- English doesn't have any */ 0, 0, NULL Modified: trunk/reactos/dll/keyboard/kbdusx/kbdusx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusx/kbdusx… ============================================================================== --- trunk/reactos/dll/keyboard/kbdusx/kbdusx.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdusx/kbdusx.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -461,7 +461,7 @@ MAKELONG(1,1), /* Version 1.0 */ - /* Ligatures -- Russian doesn't have any */ + /* Ligatures */ 0, 0, NULL Modified: trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdvntc/kbdvn… ============================================================================== --- trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -375,7 +375,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures */ 0, Modified: trunk/reactos/dll/keyboard/kbdycc/kbdycc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdycc/kbdycc… ============================================================================== --- trunk/reactos/dll/keyboard/kbdycc/kbdycc.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdycc/kbdycc.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -391,7 +391,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures */ 0, Modified: trunk/reactos/dll/keyboard/kbdycl/kbdycl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdycl/kbdycl… ============================================================================== --- trunk/reactos/dll/keyboard/kbdycl/kbdycl.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdycl/kbdycl.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -511,7 +511,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures */ 2,

1 0

[dgorbachev] 38709: Add "Turkish F" keyboard layout to USetup.
by dgorbachev＠svn.reactos.org 11 Jan '09

11 Jan '09

Author: dgorbachev Date: Sun Jan 11 13:09:11 2009 New Revision: 38709 URL: http://svn.reactos.org/svn/reactos?rev=38709&view=rev Log: Add "Turkish F" keyboard layout to USetup. Modified: trunk/reactos/base/setup/usetup/lang/th-TH.h trunk/reactos/base/setup/usetup/lang/tr-TR.h Modified: trunk/reactos/base/setup/usetup/lang/th-TH.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/th-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/th-TH.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/th-TH.h [iso-8859-1] Sun Jan 11 13:09:11 2009 @@ -3,10 +3,10 @@ MUI_LAYOUTS thTHLayouts[] = { + { L"041E", L"0002041E" }, { L"041E", L"0000041E" }, + { L"041E", L"0003041E" }, { L"041E", L"0001041E" }, - { L"041E", L"0002041E" }, - { L"041E", L"0003041E" }, { L"0409", L"00000409" }, { NULL, NULL } }; Modified: trunk/reactos/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/tr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] Sun Jan 11 13:09:11 2009 @@ -4,6 +4,7 @@ MUI_LAYOUTS trTRLayouts[] = { { L"041F", L"0000041F" }, + { L"041F", L"0001041f" }, { L"0409", L"00000409" }, { NULL, NULL } };

1 0

[dchapyshev] 38708: - Sync uxtheme with Wine head
by dchapyshev＠svn.reactos.org 11 Jan '09

11 Jan '09

Author: dchapyshev Date: Sun Jan 11 13:04:51 2009 New Revision: 38708 URL: http://svn.reactos.org/svn/reactos?rev=38708&view=rev Log: - Sync uxtheme with Wine head Modified: trunk/reactos/dll/win32/uxtheme/draw.c trunk/reactos/dll/win32/uxtheme/msstyles.c trunk/reactos/dll/win32/uxtheme/system.c Modified: trunk/reactos/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Sun Jan 11 13:04:51 2009 @@ -100,7 +100,7 @@ hParent = hwnd; if(prc) { CopyRect(&rt, prc); - MapWindowPoints(hwnd, NULL, (LPPOINT)&rt, 2); + MapWindowPoints(hwnd, hParent, (LPPOINT)&rt, 2); clip = CreateRectRgn(0,0,1,1); hasClip = GetClipRgn(hdc, clip); @@ -110,8 +110,8 @@ IntersectClipRect(hdc, prc->left, prc->top, prc->right, prc->bottom); } else { - GetClientRect(hParent, &rt); - MapWindowPoints(hParent, NULL, (LPPOINT)&rt, 2); + GetClientRect(hwnd, &rt); + MapWindowPoints(hwnd, hParent, (LPPOINT)&rt, 2); } OffsetViewportOrgEx(hdc, -rt.left, -rt.top, &org); Modified: trunk/reactos/dll/win32/uxtheme/msstyles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/msstyles… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/msstyles.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/msstyles.c [iso-8859-1] Sun Jan 11 13:04:51 2009 @@ -43,9 +43,9 @@ * Defines and global variables */ -BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, int *value); -BOOL MSSTYLES_GetNextToken(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LPWSTR lpBuff, DWORD buffSize); -void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics); +static BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, int *value); +static BOOL MSSTYLES_GetNextToken(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LPWSTR lpBuff, DWORD buffSize); +static void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics); static HRESULT MSSTYLES_GetFont (LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LOGFONTW* logfont); extern HINSTANCE hDllInst; @@ -685,9 +685,9 @@ { int r,g,b; LPCWSTR lpValueEnd = lpValue + dwValueLen; - MSSTYLES_GetNextInteger(lpValue, lpValueEnd, &lpValue, &r); - MSSTYLES_GetNextInteger(lpValue, lpValueEnd, &lpValue, &g); - if(MSSTYLES_GetNextInteger(lpValue, lpValueEnd, &lpValue, &b)) { + if(MSSTYLES_GetNextInteger(lpValue, lpValueEnd, &lpValue, &r) && + MSSTYLES_GetNextInteger(lpValue, lpValueEnd, &lpValue, &g) && + MSSTYLES_GetNextInteger(lpValue, lpValueEnd, &lpValue, &b)) { state->colorElements[state->colorCount] = iPropertyId - TMT_FIRSTCOLOR; state->colorRgb[state->colorCount++] = RGB(r,g,b); switch (iPropertyId) @@ -852,7 +852,7 @@ * PARAMS * tf Theme to parse */ -void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics) +static void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics) { static const WCHAR szSysMetrics[] = {'S','y','s','M','e','t','r','i','c','s','\0'}; static const WCHAR szGlobals[] = {'g','l','o','b','a','l','s','\0'}; @@ -1139,7 +1139,7 @@ return img->image; } -BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, int *value) +static BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, int *value) { LPCWSTR cur = lpStringStart; int total = 0; @@ -1163,7 +1163,7 @@ return TRUE; } -BOOL MSSTYLES_GetNextToken(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LPWSTR lpBuff, DWORD buffSize) { +static BOOL MSSTYLES_GetNextToken(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LPWSTR lpBuff, DWORD buffSize) { LPCWSTR cur = lpStringStart; LPCWSTR start; LPCWSTR end; @@ -1210,8 +1210,14 @@ lpCur = tp->lpValue; lpEnd = tp->lpValue + tp->dwValueLen; - MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &red); - MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &green); + if(!MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &red)) { + TRACE("Could not parse color property\n"); + return E_PROP_ID_UNSUPPORTED; + } + if(!MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &green)) { + TRACE("Could not parse color property\n"); + return E_PROP_ID_UNSUPPORTED; + } if(!MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &blue)) { TRACE("Could not parse color property\n"); return E_PROP_ID_UNSUPPORTED; @@ -1316,7 +1322,10 @@ LPCWSTR lpCur = tp->lpValue; LPCWSTR lpEnd = tp->lpValue + tp->dwValueLen; - MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &x); + if(!MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &x)) { + TRACE("Could not parse position property\n"); + return E_PROP_ID_UNSUPPORTED; + } if(!MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &y)) { TRACE("Could not parse position property\n"); return E_PROP_ID_UNSUPPORTED; Modified: trunk/reactos/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] Sun Jan 11 13:04:51 2009 @@ -916,7 +916,7 @@ * char b[] = "\0"; where \0 can be one or more of any character, makes no difference * the theme is applied smoothly (screen does not flicker) * char *b = "\0" or NULL; where \0 can be zero or more of any character, makes no difference - * the function fails returning invalid parameter...very strange + * the function fails returning invalid parameter... very strange */ HRESULT WINAPI ApplyTheme(HTHEMEFILE hThemeFile, char *unknown, HWND hWnd) {

1 0

[dchapyshev] 38707: - Sync urlmon with Wine head
by dchapyshev＠svn.reactos.org 11 Jan '09

11 Jan '09

Author: dchapyshev Date: Sun Jan 11 13:04:02 2009 New Revision: 38707 URL: http://svn.reactos.org/svn/reactos?rev=38707&view=rev Log: - Sync urlmon with Wine head Modified: trunk/reactos/dll/win32/urlmon/bindctx.c trunk/reactos/dll/win32/urlmon/binding.c trunk/reactos/dll/win32/urlmon/file.c trunk/reactos/dll/win32/urlmon/http.c trunk/reactos/dll/win32/urlmon/regsvr.c trunk/reactos/dll/win32/urlmon/umon.c trunk/reactos/dll/win32/urlmon/umstream.c trunk/reactos/dll/win32/urlmon/urlmon.spec trunk/reactos/dll/win32/urlmon/urlmon_main.c Modified: trunk/reactos/dll/win32/urlmon/bindctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/bindctx.c… ============================================================================== --- trunk/reactos/dll/win32/urlmon/bindctx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/bindctx.c [iso-8859-1] Sun Jan 11 13:04:02 2009 @@ -511,7 +511,8 @@ hres = IBindCtx_RegisterObjectParam(pbc, BSCBHolder, (IUnknown*)bsc); IBindStatusCallback_Release(bsc); if(FAILED(hres)) { - IBindStatusCallback_Release(prev); + if(prev) + IBindStatusCallback_Release(prev); return hres; } Modified: trunk/reactos/dll/win32/urlmon/binding.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/binding.c… ============================================================================== --- trunk/reactos/dll/win32/urlmon/binding.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/binding.c [iso-8859-1] Sun Jan 11 13:04:02 2009 @@ -1532,7 +1532,8 @@ {wszMk, sizeof(wszMk) /sizeof(WCHAR)} }; - int i, len = strlenW(url); + unsigned int i; + int len = lstrlenW(url); for(i=0; i < sizeof(protocol_list)/sizeof(protocol_list[0]); i++) { if(len >= protocol_list[i].len Modified: trunk/reactos/dll/win32/urlmon/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/file.c?re… ============================================================================== --- trunk/reactos/dll/win32/urlmon/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/file.c [iso-8859-1] Sun Jan 11 13:04:02 2009 @@ -109,7 +109,7 @@ TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); - if(!szUrl || lstrlenW(szUrl) < sizeof(wszFile)/sizeof(WCHAR) + if(!szUrl || strlenW(szUrl) < sizeof(wszFile)/sizeof(WCHAR) || memcmp(szUrl, wszFile, sizeof(wszFile))) return E_INVALIDARG; Modified: trunk/reactos/dll/win32/urlmon/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/http.c?re… ============================================================================== --- trunk/reactos/dll/win32/urlmon/http.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/http.c [iso-8859-1] Sun Jan 11 13:04:02 2009 @@ -330,7 +330,7 @@ goto done; } - if (lstrlenW(szUrl) < sizeof(wszHttp)/sizeof(WCHAR) + if (strlenW(szUrl) < sizeof(wszHttp)/sizeof(WCHAR) || memcmp(szUrl, wszHttp, sizeof(wszHttp))) { hres = MK_E_SYNTAX; @@ -397,7 +397,7 @@ InternetSetStatusCallbackW(This->internet, HTTPPROTOCOL_InternetStatusCallback); This->connect = InternetConnectW(This->internet, host, url.nPort, user, - pass, INTERNET_SERVICE_HTTP, 0, (DWORD)This); + pass, INTERNET_SERVICE_HTTP, 0, (DWORD_PTR)This); if (!This->connect) { WARN("InternetConnect failed: %d\n", GetLastError()); @@ -425,7 +425,7 @@ wszBindVerb[This->bind_info.dwBindVerb] : This->bind_info.szCustomVerb, path, NULL, NULL, (LPCWSTR *)accept_mimes, - request_flags, (DWORD)This); + request_flags, (DWORD_PTR)This); if (!This->request) { WARN("HttpOpenRequest failed: %d\n", GetLastError()); Modified: trunk/reactos/dll/win32/urlmon/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/regsvr.c?… ============================================================================== --- trunk/reactos/dll/win32/urlmon/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/regsvr.c [iso-8859-1] Sun Jan 11 13:04:02 2009 @@ -26,6 +26,7 @@ #include "advpub.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); @@ -152,7 +153,7 @@ KEY_READ | KEY_WRITE, NULL, &key, NULL); if (res != ERROR_SUCCESS) goto error_close_iid_key; - wsprintfW(buf, fmt, list->num_methods); + sprintfW(buf, fmt, list->num_methods); res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)buf, (lstrlenW(buf) + 1) * sizeof(WCHAR)); @@ -526,7 +527,7 @@ STRTABLEA strtable; STRENTRYA pse[7]; static CLSID const *clsids[34]; - int i = 0; + unsigned int i = 0; static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; Modified: trunk/reactos/dll/win32/urlmon/umon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/umon.c?re… ============================================================================== --- trunk/reactos/dll/win32/urlmon/umon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/umon.c [iso-8859-1] Sun Jan 11 13:04:02 2009 @@ -237,7 +237,7 @@ IBindStatusCallback_OnProgress(This->pbscb, This->total_read, This->expected_size, BINDSTATUS_ENDDOWNLOADDATA, This->URLName); IBindStatusCallback_OnDataAvailable(This->pbscb, BSCF_LASTDATANOTIFICATION, This->total_read, &fmt, &stg); - if (hr) + if (hr != S_OK) { WCHAR *pwchError = 0; @@ -606,7 +606,7 @@ } bind->hconnect = InternetConnectW(bind->hinternet, host, url.nPort, user, pass, - dwService, 0, (DWORD)bind); + dwService, 0, (DWORD_PTR)bind); if (!bind->hconnect) { hres = HRESULT_FROM_WIN32(GetLastError()); @@ -650,7 +650,7 @@ break; case INTERNET_SERVICE_HTTP: - bind->hrequest = HttpOpenRequestW(bind->hconnect, NULL, path, NULL, NULL, NULL, 0, (DWORD)bind); + bind->hrequest = HttpOpenRequestW(bind->hconnect, NULL, path, NULL, NULL, NULL, 0, (DWORD_PTR)bind); if (!bind->hrequest) { hres = HRESULT_FROM_WIN32(GetLastError()); @@ -1273,7 +1273,7 @@ header, sizeof(header), NULL, NULL)) return E_FAIL; - if (lstrlenW(cache_path) > dwBufLength) + if (strlenW(cache_path) > dwBufLength) return E_OUTOFMEMORY; lstrcpyW(szFileName, cache_path); Modified: trunk/reactos/dll/win32/urlmon/umstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/umstream.… ============================================================================== --- trunk/reactos/dll/win32/urlmon/umstream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/umstream.c [iso-8859-1] Sun Jan 11 13:04:02 2009 @@ -61,11 +61,11 @@ if(!CreateUrlCacheEntryW(url, dwSize, ext, pszFileName, 0)) hr = HRESULT_FROM_WIN32(GetLastError()); else - hr = 0; + hr = S_OK; heap_free(url); - if (hr) + if (hr != S_OK) return hr; TRACE("Opening %s\n", debugstr_w(pszFileName) ); Modified: trunk/reactos/dll/win32/urlmon/urlmon.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon.sp… ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon.spec [iso-8859-1] Sun Jan 11 13:04:02 2009 @@ -51,8 +51,8 @@ @ stub HlinkSimpleNavigateToMoniker @ stdcall HlinkSimpleNavigateToString(wstr wstr wstr ptr ptr ptr long long) @ stdcall IsAsyncMoniker(ptr) -@ stub IsLoggingEnabledA -@ stub IsLoggingEnabledW +@ stdcall IsLoggingEnabledA(str) +@ stdcall IsLoggingEnabledW(wstr) @ stdcall IsValidURL(ptr wstr long) @ stdcall MkParseDisplayNameEx(ptr wstr ptr ptr) @ stdcall ObtainUserAgentString(long str ptr) Modified: trunk/reactos/dll/win32/urlmon/urlmon_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon_ma… ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon_main.c [iso-8859-1] Sun Jan 11 13:04:02 2009 @@ -210,7 +210,7 @@ static void init_session(BOOL init) { - int i; + unsigned int i; for(i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) { @@ -240,7 +240,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { - int i; + unsigned int i; TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); @@ -435,7 +435,7 @@ static BOOL text_html_filter(const BYTE *b, DWORD size) { - int i; + DWORD i; if(size < 5) return FALSE; @@ -598,7 +598,7 @@ const BYTE *buf = pBuffer; DWORD len; LPCWSTR ret = NULL; - int i; + unsigned int i; static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; static const WCHAR wszTextRichtext[] = {'t','e','x','t','/','r','i','c','h','t','e','x','t',0}; @@ -767,3 +767,21 @@ return pExtract(dest, szCabName); } + +/*********************************************************************** + * IsLoggingEnabledA (URLMON.@) + */ +BOOL WINAPI IsLoggingEnabledA(LPCSTR url) +{ + FIXME("(%s)\n", debugstr_a(url)); + return FALSE; +} + +/*********************************************************************** + * IsLoggingEnabledW (URLMON.@) + */ +BOOL WINAPI IsLoggingEnabledW(LPCWSTR url) +{ + FIXME("(%s)\n", debugstr_w(url)); + return FALSE; +}

1 0

[dchapyshev] 38706: - Sync wldap32 with Wine head
by dchapyshev＠svn.reactos.org 11 Jan '09

11 Jan '09

Author: dchapyshev Date: Sun Jan 11 13:02:16 2009 New Revision: 38706 URL: http://svn.reactos.org/svn/reactos?rev=38706&view=rev Log: - Sync wldap32 with Wine head Added: trunk/reactos/dll/win32/wldap32/wldap32_Pt.rc (with props) Modified: trunk/reactos/dll/win32/wldap32/add.c trunk/reactos/dll/win32/wldap32/ber.c trunk/reactos/dll/win32/wldap32/bind.c trunk/reactos/dll/win32/wldap32/compare.c trunk/reactos/dll/win32/wldap32/control.c trunk/reactos/dll/win32/wldap32/delete.c trunk/reactos/dll/win32/wldap32/error.c trunk/reactos/dll/win32/wldap32/extended.c trunk/reactos/dll/win32/wldap32/init.c trunk/reactos/dll/win32/wldap32/misc.c trunk/reactos/dll/win32/wldap32/modify.c trunk/reactos/dll/win32/wldap32/modrdn.c trunk/reactos/dll/win32/wldap32/option.c trunk/reactos/dll/win32/wldap32/page.c trunk/reactos/dll/win32/wldap32/parse.c trunk/reactos/dll/win32/wldap32/rename.c trunk/reactos/dll/win32/wldap32/search.c trunk/reactos/dll/win32/wldap32/winldap_private.h trunk/reactos/dll/win32/wldap32/wldap32.h trunk/reactos/dll/win32/wldap32/wldap32.rc trunk/reactos/dll/win32/wldap32/wldap32_Ko.rc Modified: trunk/reactos/dll/win32/wldap32/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/add.c?re… ============================================================================== --- trunk/reactos/dll/win32/wldap32/add.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/add.c [iso-8859-1] Sun Jan 11 13:02:16 2009 @@ -58,7 +58,7 @@ TRACE( "(%p, %s, %p)\n", ld, debugstr_a(dn), attrs ); - if (!ld) return ~0UL; + if (!ld) return ~0u; if (dn) { dnW = strAtoW( dn ); @@ -127,7 +127,7 @@ if (ret == LDAP_SUCCESS) ret = msg; else - ret = ~0UL; + ret = ~0u; exit: strfreeU( dnU ); @@ -244,8 +244,8 @@ if (!clientctrlsU) goto exit; } - ret = ldap_add_ext( ld, dn ? dnU : "", attrs ? attrsU : nullattrs, serverctrlsU, - clientctrlsU, message ? (int *)message : &dummy ); + ret = map_error( ldap_add_ext( ld, dn ? dnU : "", attrs ? attrsU : nullattrs, serverctrlsU, + clientctrlsU, message ? (int *)message : &dummy )); exit: strfreeU( dnU ); @@ -361,8 +361,8 @@ if (!clientctrlsU) goto exit; } - ret = ldap_add_ext_s( ld, dn ? dnU : "", attrs ? attrsU : nullattrs, - serverctrlsU, clientctrlsU ); + ret = map_error( ldap_add_ext_s( ld, dn ? dnU : "", attrs ? attrsU : nullattrs, + serverctrlsU, clientctrlsU )); exit: strfreeU( dnU ); @@ -448,7 +448,7 @@ if (!attrsU) goto exit; } - ret = ldap_add_ext_s( ld, dn ? dnU : "", attrs ? attrsU : nullattrs, NULL, NULL ); + ret = map_error( ldap_add_ext_s( ld, dn ? dnU : "", attrs ? attrsU : nullattrs, NULL, NULL )); exit: strfreeU( dnU ); Modified: trunk/reactos/dll/win32/wldap32/ber.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/ber.c?re… ============================================================================== --- trunk/reactos/dll/win32/wldap32/ber.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/ber.c [iso-8859-1] Sun Jan 11 13:02:16 2009 @@ -325,12 +325,12 @@ INT CDECL WLDAP32_ber_printf( BerElement *berelement, PCHAR fmt, ... ) { #ifdef HAVE_LDAP - va_list list; + __ms_va_list list; int ret = 0; char new_fmt[2]; new_fmt[1] = 0; - va_start( list, fmt ); + __ms_va_start( list, fmt ); while (*fmt) { new_fmt[0] = *fmt++; @@ -391,7 +391,7 @@ } if (ret == -1) break; } - va_end( list ); + __ms_va_end( list ); return ret; #else return LBER_ERROR; @@ -420,12 +420,12 @@ INT CDECL WLDAP32_ber_scanf( BerElement *berelement, PCHAR fmt, ... ) { #ifdef HAVE_LDAP - va_list list; + __ms_va_list list; int ret = 0; char new_fmt[2]; new_fmt[1] = 0; - va_start( list, fmt ); + __ms_va_start( list, fmt ); while (*fmt) { new_fmt[0] = *fmt++; @@ -491,7 +491,7 @@ } if (ret == -1) break; } - va_end( list ); + __ms_va_end( list ); return ret; #else return LBER_ERROR; Modified: trunk/reactos/dll/win32/wldap32/bind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/bind.c?r… ============================================================================== --- trunk/reactos/dll/win32/wldap32/bind.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/bind.c [iso-8859-1] Sun Jan 11 13:02:16 2009 @@ -53,7 +53,7 @@ TRACE( "(%p, %s, %p, 0x%08x)\n", ld, debugstr_a(dn), cred, method ); - if (!ld) return ~0UL; + if (!ld) return ~0u; if (dn) { dnW = strAtoW( dn ); @@ -104,7 +104,7 @@ TRACE( "(%p, %s, %p, 0x%08x)\n", ld, debugstr_w(dn), cred, method ); - if (!ld) return ~0UL; + if (!ld) return ~0u; if (method != LDAP_AUTH_SIMPLE) return WLDAP32_LDAP_PARAM_ERROR; if (dn) { @@ -124,7 +124,7 @@ if (ret == LDAP_SUCCESS) ret = msg; else - ret = ~0UL; + ret = ~0u; exit: strfreeU( dnU ); @@ -211,7 +211,7 @@ pwd.bv_val = credU; } - ret = ldap_sasl_bind_s( ld, dnU, LDAP_SASL_SIMPLE, &pwd, NULL, NULL, NULL ); + ret = map_error( ldap_sasl_bind_s( ld, dnU, LDAP_SASL_SIMPLE, &pwd, NULL, NULL, NULL )); exit: strfreeU( dnU ); @@ -328,8 +328,8 @@ credU.bv_len = cred->bv_len; credU.bv_val = cred->bv_val; - ret = ldap_sasl_bind( ld, dnU, mechanismU, &credU, - serverctrlsU, clientctrlsU, message ); + ret = map_error( ldap_sasl_bind( ld, dnU, mechanismU, &credU, + serverctrlsU, clientctrlsU, message )); exit: strfreeU( dnU ); @@ -448,8 +448,8 @@ credU.bv_len = cred->bv_len; credU.bv_val = cred->bv_val; - ret = ldap_sasl_bind_s( ld, dnU, mechanismU, &credU, - serverctrlsU, clientctrlsU, (struct berval **)serverdata ); + ret = map_error( ldap_sasl_bind_s( ld, dnU, mechanismU, &credU, + serverctrlsU, clientctrlsU, (struct berval **)serverdata )); exit: strfreeU( dnU ); @@ -476,7 +476,7 @@ TRACE( "(%p, %s, %p)\n", ld, debugstr_a(dn), passwd ); - if (!ld) return ~0UL; + if (!ld) return ~0u; if (dn) { dnW = strAtoW( dn ); @@ -526,7 +526,7 @@ TRACE( "(%p, %s, %p)\n", ld, debugstr_w(dn), passwd ); - if (!ld) return ~0UL; + if (!ld) return ~0u; if (dn) { dnU = strWtoU( dn ); @@ -545,7 +545,7 @@ if (ret == LDAP_SUCCESS) ret = msg; else - ret = ~0UL; + ret = ~0u; exit: strfreeU( dnU ); @@ -633,7 +633,7 @@ pwd.bv_val = passwdU; } - ret = ldap_sasl_bind_s( ld, dnU, LDAP_SASL_SIMPLE, &pwd, NULL, NULL, NULL ); + ret = map_error( ldap_sasl_bind_s( ld, dnU, LDAP_SASL_SIMPLE, &pwd, NULL, NULL, NULL )); exit: strfreeU( dnU ); @@ -663,7 +663,7 @@ TRACE( "(%p)\n", ld ); if (ld) - ret = ldap_unbind_ext( ld, NULL, NULL ); + ret = map_error( ldap_unbind_ext( ld, NULL, NULL )); else ret = WLDAP32_LDAP_PARAM_ERROR; @@ -691,7 +691,7 @@ TRACE( "(%p)\n", ld ); if (ld) - ret = ldap_unbind_ext_s( ld, NULL, NULL ); + ret = map_error( ldap_unbind_ext_s( ld, NULL, NULL )); else ret = WLDAP32_LDAP_PARAM_ERROR; Modified: trunk/reactos/dll/win32/wldap32/compare.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/compare.… ============================================================================== --- trunk/reactos/dll/win32/wldap32/compare.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/compare.c [iso-8859-1] Sun Jan 11 13:02:16 2009 @@ -49,12 +49,12 @@ #ifdef HAVE_LDAP WCHAR *dnW = NULL, *attrW = NULL, *valueW = NULL; - ret = ~0UL; + ret = ~0u; TRACE( "(%p, %s, %s, %s)\n", ld, debugstr_a(dn), debugstr_a(attr), debugstr_a(value) ); - if (!ld || !attr) return ~0UL; + if (!ld || !attr) return ~0u; if (dn) { dnW = strAtoW( dn ); @@ -103,12 +103,12 @@ struct berval val = { 0, NULL }; int msg; - ret = ~0UL; + ret = ~0u; TRACE( "(%p, %s, %s, %s)\n", ld, debugstr_w(dn), debugstr_w(attr), debugstr_w(value) ); - if (!ld || !attr) return ~0UL; + if (!ld || !attr) return ~0u; if (dn) { dnU = strWtoU( dn ); @@ -131,7 +131,7 @@ if (ret == LDAP_SUCCESS) ret = msg; else - ret = ~0UL; + ret = ~0u; exit: strfreeU( dnU ); @@ -268,8 +268,8 @@ if (!clientctrlsU) goto exit; } - ret = ldap_compare_ext( ld, dn ? dnU : "", attrU, data ? (struct berval *)data : &val, - serverctrlsU, clientctrlsU, (int *)message ); + ret = map_error( ldap_compare_ext( ld, dn ? dnU : "", attrU, data ? (struct berval *)data : &val, + serverctrlsU, clientctrlsU, (int *)message )); exit: strfreeU( dnU ); @@ -404,9 +404,9 @@ if (!clientctrlsU) goto exit; } - ret = ldap_compare_ext_s( ld, dn ? dnU : "", attr ? attrU : "", - data ? (struct berval *)data : &val, - serverctrlsU, clientctrlsU ); + ret = map_error( ldap_compare_ext_s( ld, dn ? dnU : "", attr ? attrU : "", + data ? (struct berval *)data : &val, + serverctrlsU, clientctrlsU )); exit: strfreeU( dnU ); @@ -506,7 +506,7 @@ val.bv_val = valueU; } - ret = ldap_compare_ext_s( ld, dn ? dnU : "", attr ? attrU : "", &val, NULL, NULL ); + ret = map_error( ldap_compare_ext_s( ld, dn ? dnU : "", attr ? attrU : "", &val, NULL, NULL )); exit: strfreeU( dnU ); Modified: trunk/reactos/dll/win32/wldap32/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/control.… ============================================================================== --- trunk/reactos/dll/win32/wldap32/control.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/control.c [iso-8859-1] Sun Jan 11 13:02:16 2009 @@ -189,7 +189,7 @@ sortkeyU = sortkeyarrayWtoU( sortkey ); if (!sortkeyU) return WLDAP32_LDAP_NO_MEMORY; - ret = ldap_create_sort_control( ld, sortkeyU, critical, &controlU ); + ret = map_error( ldap_create_sort_control( ld, sortkeyU, critical, &controlU )); *control = controlUtoW( controlU ); if (!*control) ret = WLDAP32_LDAP_NO_MEMORY; @@ -215,7 +215,7 @@ TRACE( "(%p, %p, 0x%02x, %p)\n", ld, info, critical, control ); - if (!ld || !control) return ~0UL; + if (!ld || !control) return ~0u; ret = ldap_create_vlv_controlW( ld, info, critical, &controlW ); @@ -261,11 +261,11 @@ TRACE( "(%p, %p, 0x%02x, %p)\n", ld, info, critical, control ); - if (!ld || !control) return ~0UL; - - ret = ldap_create_vlv_control( ld, (LDAPVLVInfo *)info, &controlU ); - - if (ret == LDAP_SUCCESS) + if (!ld || !control) return ~0u; + + ret = map_error( ldap_create_vlv_control( ld, (LDAPVLVInfo *)info, &controlU )); + + if (ret == WLDAP32_LDAP_SUCCESS) { *control = controlUtoW( controlU ); if (!*control) ret = WLDAP32_LDAP_NO_MEMORY; Modified: trunk/reactos/dll/win32/wldap32/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/delete.c… ============================================================================== --- trunk/reactos/dll/win32/wldap32/delete.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/delete.c [iso-8859-1] Sun Jan 11 13:02:16 2009 @@ -51,7 +51,7 @@ TRACE( "(%p, %s)\n", ld, debugstr_a(dn) ); - if (!ld) return ~0UL; + if (!ld) return ~0u; if (dn) { dnW = strAtoW( dn ); @@ -92,7 +92,7 @@ TRACE( "(%p, %s)\n", ld, debugstr_w(dn) ); - if (!ld) return ~0UL; + if (!ld) return ~0u; if (dn) { dnU = strWtoU( dn ); @@ -104,7 +104,7 @@ if (ret == LDAP_SUCCESS) ret = msg; else - ret = ~0UL; + ret = ~0u; strfreeU( dnU ); @@ -206,8 +206,8 @@ if (!clientctrlsU) goto exit; } - ret = ldap_delete_ext( ld, dn ? dnU : "", serverctrlsU, clientctrlsU, - message ? (int *)message : &dummy ); + ret = map_error( ldap_delete_ext( ld, dn ? dnU : "", serverctrlsU, clientctrlsU, + message ? (int *)message : &dummy )); exit: strfreeU( dnU ); @@ -305,7 +305,7 @@ if (!clientctrlsU) goto exit; } - ret = ldap_delete_ext_s( ld, dn ? dnU : "", serverctrlsU, clientctrlsU ); + ret = map_error( ldap_delete_ext_s( ld, dn ? dnU : "", serverctrlsU, clientctrlsU )); exit: strfreeU( dnU ); @@ -371,7 +371,7 @@ if (!dnU) return WLDAP32_LDAP_NO_MEMORY; } - ret = ldap_delete_ext_s( ld, dn ? dnU : "", NULL, NULL ); + ret = map_error( ldap_delete_ext_s( ld, dn ? dnU : "", NULL, NULL )); strfreeU( dnU ); #endif Modified: trunk/reactos/dll/win32/wldap32/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/error.c?… ============================================================================== --- trunk/reactos/dll/win32/wldap32/error.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/error.c [iso-8859-1] Sun Jan 11 13:02:16 2009 @@ -41,6 +41,32 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +ULONG map_error( int error ) +{ + switch (error) + { +#ifdef HAVE_LDAP_H + case LDAP_SERVER_DOWN: return WLDAP32_LDAP_SERVER_DOWN; + case LDAP_LOCAL_ERROR: return WLDAP32_LDAP_LOCAL_ERROR; + case LDAP_DECODING_ERROR: return WLDAP32_LDAP_DECODING_ERROR; + case LDAP_TIMEOUT: return WLDAP32_LDAP_TIMEOUT; + case LDAP_AUTH_UNKNOWN: return WLDAP32_LDAP_AUTH_UNKNOWN; + case LDAP_FILTER_ERROR: return WLDAP32_LDAP_FILTER_ERROR; + case LDAP_USER_CANCELLED: return WLDAP32_LDAP_USER_CANCELLED; + case LDAP_PARAM_ERROR: return WLDAP32_LDAP_PARAM_ERROR; + case LDAP_NO_MEMORY: return WLDAP32_LDAP_NO_MEMORY; + case LDAP_CONNECT_ERROR: return WLDAP32_LDAP_CONNECT_ERROR; + case LDAP_NOT_SUPPORTED: return WLDAP32_LDAP_NOT_SUPPORTED; + case LDAP_CONTROL_NOT_FOUND: return WLDAP32_LDAP_CONTROL_NOT_FOUND; + case LDAP_NO_RESULTS_RETURNED: return WLDAP32_LDAP_NO_RESULTS_RETURNED; + case LDAP_MORE_RESULTS_TO_RETURN: return WLDAP32_LDAP_MORE_RESULTS_TO_RETURN; + case LDAP_CLIENT_LOOP: return WLDAP32_LDAP_CLIENT_LOOP; + case LDAP_REFERRAL_LIMIT_EXCEEDED: return WLDAP32_LDAP_REFERRAL_LIMIT_EXCEEDED; +#endif + default: return error; + } +} + /*********************************************************************** * ldap_err2stringA (WLDAP32.@) * @@ -135,14 +161,14 @@ TRACE( "(%p, %p, 0x%08x)\n", ld, res, free ); - if (!ld || !res) return ~0UL; + if (!ld || !res) return ~0u; ret = ldap_parse_result( ld, res, &error, NULL, NULL, NULL, NULL, free ); if (ret == LDAP_SUCCESS) ret = error; else - ret = ~0UL; + ret = ~0u; #endif return ret; Modified: trunk/reactos/dll/win32/wldap32/extended.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/extended… ============================================================================== --- trunk/reactos/dll/win32/wldap32/extended.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/extended.c [iso-8859-1] Sun Jan 11 13:02:16 2009 @@ -160,8 +160,8 @@ if (!clientctrlsU) goto exit; } - ret = ldap_extended_operation( ld, oid ? oidU : "", (struct berval *)data, - serverctrlsU, clientctrlsU, (int *)message ); + ret = map_error( ldap_extended_operation( ld, oid ? oidU : "", (struct berval *)data, + serverctrlsU, clientctrlsU, (int *)message )); exit: strfreeU( oidU ); @@ -277,8 +277,8 @@ if (!clientctrlsU) goto exit; } - ret = ldap_extended_operation_s( ld, oid ? oidU : "", (struct berval *)data, serverctrlsU, - clientctrlsU, &retoidU, (struct berval **)retdata ); + ret = map_error( ldap_extended_operation_s( ld, oid ? oidU : "", (struct berval *)data, serverctrlsU, + clientctrlsU, &retoidU, (struct berval **)retdata )); if (retoid && retoidU) { *retoid = strUtoW( retoidU ); Modified: trunk/reactos/dll/win32/wldap32/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/init.c?r… ============================================================================== --- trunk/reactos/dll/win32/wldap32/init.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/init.c [iso-8859-1] Sun Jan 11 13:02:16 2009 @@ -584,7 +584,7 @@ TRACE( "(%p, %p, %p, %p, %p)\n", ld, retval, result, serverctrls, clientctrls ); - if (!ld) return ~0UL; + if (!ld) return ~0u; if (serverctrls) { serverctrlsW = controlarrayAtoW( serverctrls ); @@ -635,7 +635,7 @@ TRACE( "(%p, %p, %p, %p, %p)\n", ld, retval, result, serverctrls, clientctrls ); - if (!ld) return ~0UL; + if (!ld) return ~0u; if (serverctrls) { serverctrlsU = controlarrayWtoU( serverctrls ); @@ -646,7 +646,7 @@ if (!clientctrlsU) goto exit; } - ret = ldap_start_tls_s( ld, serverctrlsU, clientctrlsU ); + ret = map_error( ldap_start_tls_s( ld, serverctrlsU, clientctrlsU )); exit: controlarrayfreeU( serverctrlsU ); Modified: trunk/reactos/dll/win32/wldap32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/misc.c?r… ============================================================================== --- trunk/reactos/dll/win32/wldap32/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/misc.c [iso-8859-1] Sun Jan 11 13:02:16 2009 @@ -59,8 +59,8 @@ TRACE( "(%p, 0x%08x)\n", ld, msgid ); - if (!ld) return ~0UL; - ret = ldap_abandon_ext( ld, msgid, NULL, NULL ); + if (!ld) return ~0u; + ret = map_error( ldap_abandon_ext( ld, msgid, NULL, NULL )); #endif return ret; @@ -153,7 +153,7 @@ * * RETURNS * Success: The number of entries. - * Failure: ~0UL + * Failure: ~0u */ ULONG CDECL WLDAP32_ldap_count_entries( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *res ) { @@ -162,7 +162,7 @@ TRACE( "(%p, %p)\n", ld, res ); - if (!ld) return ~0UL; + if (!ld) return ~0u; ret = ldap_count_entries( ld, res ); #endif @@ -180,7 +180,7 @@ * * RETURNS * Success: The number of references. - * Failure: ~0UL + * Failure: ~0u */ ULONG CDECL WLDAP32_ldap_count_references( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *res ) { @@ -596,7 +596,7 @@ * LDAP_RES_SEARCH_ENTRY * LDAP_RES_SEARCH_RESULT * - * Failure: ~0UL + * Failure: ~0u * * This function returns 0 when the timeout has expired. * @@ -614,7 +614,7 @@ TRACE( "(%p, 0x%08x, 0x%08x, %p, %p)\n", ld, msgid, all, timeout, res ); - if (!ld || !res || msgid == ~0UL) return ~0UL; + if (!ld || !res || msgid == ~0u) return ~0u; ret = ldap_result( ld, msgid, all, (struct timeval *)timeout, res ); #endif Modified: trunk/reactos/dll/win32/wldap32/modify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/modify.c… ============================================================================== --- trunk/reactos/dll/win32/wldap32/modify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/modify.c [iso-8859-1] Sun Jan 11 13:02:16 2009 @@ -58,7 +58,7 @@ TRACE( "(%p, %s, %p)\n", ld, debugstr_a(dn), mods ); - if (!ld) return ~0UL; + if (!ld) return ~0u; if (dn) { dnW = strAtoW( dn ); @@ -128,7 +128,7 @@ if (ret == LDAP_SUCCESS) ret = msg; else - ret = ~0UL; + ret = ~0u; exit: strfreeU( dnU ); @@ -157,7 +157,7 @@ TRACE( "(%p, %s, %p, %p, %p, %p)\n", ld, debugstr_a(dn), mods, serverctrls, clientctrls, message ); - if (!ld) return ~0UL; + if (!ld) return ~0u; if (dn) { dnW = strAtoW( dn ); @@ -226,7 +226,7 @@ TRACE( "(%p, %s, %p, %p, %p, %p)\n", ld, debugstr_w(dn), mods, serverctrls, clientctrls, message ); - if (!ld) return ~0UL; + if (!ld) return ~0u; if (dn) { dnU = strWtoU( dn ); @@ -245,8 +245,8 @@ if (!clientctrlsU) goto exit; } - ret = ldap_modify_ext( ld, dn ? dnU : "", mods ? modsU : nullmods, serverctrlsU, - clientctrlsU, message ? (int *)message : &dummy ); + ret = map_error( ldap_modify_ext( ld, dn ? dnU : "", mods ? modsU : nullmods, serverctrlsU, + clientctrlsU, message ? (int *)message : &dummy )); exit: strfreeU( dnU ); @@ -362,8 +362,8 @@ if (!clientctrlsU) goto exit; } - ret = ldap_modify_ext_s( ld, dn ? dnU : "", mods ? modsU : nullmods, - serverctrlsU, clientctrlsU ); + ret = map_error( ldap_modify_ext_s( ld, dn ? dnU : "", mods ? modsU : nullmods, + serverctrlsU, clientctrlsU )); exit: strfreeU( dnU ); @@ -449,7 +449,7 @@ if (!modsU) goto exit; } - ret = ldap_modify_ext_s( ld, dn ? dnU : "", mods ? modsU : nullmods, NULL, NULL ); + ret = map_error( ldap_modify_ext_s( ld, dn ? dnU : "", mods ? modsU : nullmods, NULL, NULL )); exit: strfreeU( dnU ); Modified: trunk/reactos/dll/win32/wldap32/modrdn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/modrdn.c… ============================================================================== --- trunk/reactos/dll/win32/wldap32/modrdn.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/modrdn.c [iso-8859-1] Sun Jan 11 13:02:16 2009 @@ -53,7 +53,7 @@ TRACE( "(%p, %s, %s)\n", ld, debugstr_a(dn), debugstr_a(newdn) ); - if (!ld || !newdn) return ~0UL; + if (!ld || !newdn) return ~0u; if (dn) { dnW = strAtoW( dn ); @@ -103,7 +103,7 @@ TRACE( "(%p, %s, %s)\n", ld, debugstr_w(dn), debugstr_w(newdn) ); - if (!ld || !newdn) return ~0UL; + if (!ld || !newdn) return ~0u; if (dn) { dnU = strWtoU( dn ); @@ -118,7 +118,7 @@ if (ret == LDAP_SUCCESS) ret = msg; else - ret = ~0UL; + ret = ~0u; exit: strfreeU( dnU ); @@ -143,7 +143,7 @@ TRACE( "(%p, %s, %p, 0x%02x)\n", ld, debugstr_a(dn), newdn, delete ); - if (!ld || !newdn) return ~0UL; + if (!ld || !newdn) return ~0u; if (dn) { dnW = strAtoW( dn ); @@ -194,7 +194,7 @@ TRACE( "(%p, %s, %p, 0x%02x)\n", ld, debugstr_w(dn), newdn, delete ); - if (!ld || !newdn) return ~0UL; + if (!ld || !newdn) return ~0u; if (dn) { dnU = strWtoU( dn ); @@ -209,7 +209,7 @@ if (ret == LDAP_SUCCESS) ret = msg; else - ret = ~0UL; + ret = ~0u; exit: strfreeU( dnU ); @@ -289,7 +289,7 @@ newdnU = strWtoU( newdn ); if (!newdnU) goto exit; - ret = ldap_rename_s( ld, dn ? dnU : "", newdnU, NULL, delete, NULL, NULL ); + ret = map_error( ldap_rename_s( ld, dn ? dnU : "", newdnU, NULL, delete, NULL, NULL )); exit: strfreeU( dnU ); @@ -368,7 +368,7 @@ newdnU = strWtoU( newdn ); if (!newdnU) goto exit; - ret = ldap_rename_s( ld, dn ? dnU : "", newdnU, NULL, 1, NULL, NULL ); + ret = map_error( ldap_rename_s( ld, dn ? dnU : "", newdnU, NULL, 1, NULL, NULL )); exit: strfreeU( dnU ); Modified: trunk/reactos/dll/win32/wldap32/option.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/option.c… ============================================================================== --- trunk/reactos/dll/win32/wldap32/option.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/option.c [iso-8859-1] Sun Jan 11 13:02:16 2009 @@ -206,7 +206,7 @@ if (!featureU.ldapaif_name) return WLDAP32_LDAP_NO_MEMORY; - ret = ldap_get_option( ld, option, &featureU ); + ret = map_error( ldap_get_option( ld, option, &featureU )); featureW->ldapaif_version = featureU.ldapaif_version; strfreeU( featureU.ldapaif_name ); @@ -220,7 +220,7 @@ memset( &infoU, 0, sizeof(LDAPAPIInfo) ); infoU.ldapai_info_version = infoW->ldapai_info_version; - ret = ldap_get_option( ld, option, &infoU ); + ret = map_error( ldap_get_option( ld, option, &infoU )); infoW->ldapai_api_version = infoU.ldapai_api_version; infoW->ldapai_protocol_version = infoU.ldapai_protocol_version; @@ -253,7 +253,7 @@ case WLDAP32_LDAP_OPT_REFERRALS: case WLDAP32_LDAP_OPT_SIZELIMIT: case WLDAP32_LDAP_OPT_TIMELIMIT: - return ldap_get_option( ld, option, value ); + return map_error( ldap_get_option( ld, option, value )); case WLDAP32_LDAP_OPT_CACHE_ENABLE: case WLDAP32_LDAP_OPT_CACHE_FN_PTRS: @@ -433,7 +433,7 @@ ctrlsU = controlarrayWtoU( (LDAPControlW **)value ); if (!ctrlsU) return WLDAP32_LDAP_NO_MEMORY; - ret = ldap_set_option( ld, option, ctrlsU ); + ret = map_error( ldap_set_option( ld, option, ctrlsU )); controlarrayfreeU( ctrlsU ); return ret; } @@ -444,7 +444,7 @@ case WLDAP32_LDAP_OPT_REFERRALS: case WLDAP32_LDAP_OPT_SIZELIMIT: case WLDAP32_LDAP_OPT_TIMELIMIT: - return ldap_set_option( ld, option, value ); + return map_error( ldap_set_option( ld, option, value )); case WLDAP32_LDAP_OPT_CACHE_ENABLE: case WLDAP32_LDAP_OPT_CACHE_FN_PTRS: Modified: trunk/reactos/dll/win32/wldap32/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/page.c?r… ============================================================================== --- trunk/reactos/dll/win32/wldap32/page.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/page.c [iso-8859-1] Sun Jan 11 13:02:16 2009 @@ -168,7 +168,7 @@ { FIXME( "(%p, %p, 0x%08x, %p)\n", ld, search, pagesize, message ); - if (!ld) return ~0UL; + if (!ld) return ~0u; return WLDAP32_LDAP_NOT_SUPPORTED; } @@ -179,7 +179,7 @@ FIXME( "(%p, %p, %p, 0x%08x, %p, %p)\n", ld, search, timeout, pagesize, count, results ); - if (!ld) return ~0UL; + if (!ld) return ~0u; return WLDAP32_LDAP_NOT_SUPPORTED; } @@ -269,7 +269,7 @@ { FIXME( "(%p, %p)\n", ld, search ); - if (!ld) return ~0UL; + if (!ld) return ~0u; return WLDAP32_LDAP_SUCCESS; } Modified: trunk/reactos/dll/win32/wldap32/parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/parse.c?… ============================================================================== --- trunk/reactos/dll/win32/wldap32/parse.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/parse.c [iso-8859-1] Sun Jan 11 13:02:16 2009 @@ -99,7 +99,7 @@ if (!ld) return WLDAP32_LDAP_PARAM_ERROR; if (!result) return WLDAP32_LDAP_NO_RESULTS_RETURNED; - ret = ldap_parse_extended_result( ld, result, &oidU, (struct berval **)data, free ); + ret = map_error( ldap_parse_extended_result( ld, result, &oidU, (struct berval **)data, free ) ); if (oid) { *oid = strUtoW( oidU ); @@ -125,7 +125,7 @@ TRACE( "(%p, %p, %p)\n", ld, message, referrals ); - if (!ld) return ~0UL; + if (!ld) return ~0u; ret = ldap_parse_referenceW( ld, message, &referralsW ); @@ -162,9 +162,9 @@ TRACE( "(%p, %p, %p)\n", ld, message, referrals ); - if (!ld) return ~0UL; + if (!ld) return ~0u; - ret = ldap_parse_reference( ld, message, &referralsU, NULL, 0 ); + ret = map_error( ldap_parse_reference( ld, message, &referralsU, NULL, 0 )); *referrals = strarrayUtoW( referralsU ); ldap_memfree( referralsU ); @@ -184,25 +184,25 @@ { ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED; #ifdef HAVE_LDAP - WCHAR **matchedW = NULL, **errorW = NULL, **referralsW = NULL; + WCHAR *matchedW = NULL, *errorW = NULL, **referralsW = NULL; LDAPControlW **serverctrlsW = NULL; TRACE( "(%p, %p, %p, %p, %p, %p, %p, 0x%02x)\n", ld, result, retcode, matched, error, referrals, serverctrls, free ); - if (!ld) return ~0UL; - - ret = ldap_parse_resultW( ld, result, retcode, matchedW, errorW, + if (!ld) return WLDAP32_LDAP_PARAM_ERROR; + + ret = ldap_parse_resultW( ld, result, retcode, &matchedW, &errorW, &referralsW, &serverctrlsW, free ); - matched = strarrayWtoA( matchedW ); - error = strarrayWtoA( errorW ); - - *referrals = strarrayWtoA( referralsW ); - *serverctrls = controlarrayWtoA( serverctrlsW ); - - ldap_value_freeW( matchedW ); - ldap_value_freeW( errorW ); + if (matched) *matched = strWtoA( matchedW ); + if (error) *error = strWtoA( errorW ); + + if (referrals) *referrals = strarrayWtoA( referralsW ); + if (serverctrls) *serverctrls = controlarrayWtoA( serverctrlsW ); + + ldap_memfreeW( matchedW ); + ldap_memfreeW( errorW ); ldap_value_freeW( referralsW ); ldap_controls_freeW( serverctrlsW ); @@ -241,26 +241,26 @@ { ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED; #ifdef HAVE_LDAP - char **matchedU = NULL, **errorU = NULL, **referralsU = NULL; + char *matchedU = NULL, *errorU = NULL, **referralsU = NULL; LDAPControl **serverctrlsU = NULL; TRACE( "(%p, %p, %p, %p, %p, %p, %p, 0x%02x)\n", ld, result, retcode, matched, error, referrals, serverctrls, free ); - if (!ld) return ~0UL; - - ret = ldap_parse_result( ld, result, (int *)retcode, matchedU, errorU, - &referralsU, &serverctrlsU, free ); - - matched = strarrayUtoW( matchedU ); - error = strarrayUtoW( errorU ); - - *referrals = strarrayUtoW( referralsU ); - *serverctrls = controlarrayUtoW( serverctrlsU ); + if (!ld) return WLDAP32_LDAP_PARAM_ERROR; + + ret = map_error( ldap_parse_result( ld, result, (int *)retcode, &matchedU, &errorU, + &referralsU, &serverctrlsU, free )); + + if (matched) *matched = strUtoW( matchedU ); + if (error) *error = strUtoW( errorU ); + + if (referrals) *referrals = strarrayUtoW( referralsU ); + if (serverctrls) *serverctrls = controlarrayUtoW( serverctrlsU ); ldap_memfree( matchedU ); ldap_memfree( errorU ); - ldap_memfree( referralsU ); + strarrayfreeU( referralsU ); ldap_controls_free( serverctrlsU ); #endif @@ -282,12 +282,11 @@ TRACE( "(%p, %p, %p, %p)\n", ld, control, result, attr ); - if (!ld) return ~0UL; - - if (control) { - controlW = controlarrayAtoW( control ); - if (!controlW) return WLDAP32_LDAP_NO_MEMORY; - } + if (!ld) return WLDAP32_LDAP_PARAM_ERROR; + if (!control) return WLDAP32_LDAP_CONTROL_NOT_FOUND; + + controlW = controlarrayAtoW( control ); + if (!controlW) return WLDAP32_LDAP_NO_MEMORY; ret = ldap_parse_sort_controlW( ld, controlW, result, &attrW ); @@ -333,12 +332,11 @@ TRACE( "(%p, %p, %p, %p)\n", ld, control, result, attr ); - if (!ld) return ~0UL; - - if (control) { - controlU = controlarrayWtoU( control ); - if (!controlU) return WLDAP32_LDAP_NO_MEMORY; - } + if (!ld) return WLDAP32_LDAP_PARAM_ERROR; + if (!control) return WLDAP32_LDAP_CONTROL_NOT_FOUND; + + controlU = controlarrayWtoU( control ); + if (!controlU) return WLDAP32_LDAP_NO_MEMORY; #ifdef HAVE_LDAP_PARSE_SORT_CONTROL if (!(ret = ldap_parse_sort_control( ld, controlU, &res, &attrU ))) @@ -366,7 +364,7 @@ controlarrayfreeU( controlU ); #endif - return ret; + return map_error( ret ); } /*********************************************************************** @@ -385,7 +383,7 @@ TRACE( "(%p, %p, %p, %p, %p, %p)\n", ld, control, targetpos, listcount, context, errcode ); - if (!ld) return ~0UL; + if (!ld) return ~0u; if (control) { controlW = controlarrayAtoW( control ); @@ -439,12 +437,10 @@ TRACE( "(%p, %p, %p, %p, %p, %p)\n", ld, control, targetpos, listcount, context, errcode ); - if (!ld) return ~0UL; - - if (control) { - controlU = controlarrayWtoU( control ); - if (!controlU) return WLDAP32_LDAP_NO_MEMORY; - } + if (!ld || !control) return ~0u; + + controlU = controlarrayWtoU( control ); + if (!controlU) return WLDAP32_LDAP_NO_MEMORY; #ifdef HAVE_LDAP_PARSE_VLV_CONTROL if (!(ret = ldap_parse_vlv_control( ld, controlU, &pos, &count, @@ -474,5 +470,5 @@ controlarrayfreeU( controlU ); #endif - return ret; -} + return map_error( ret ); +} Modified: trunk/reactos/dll/win32/wldap32/rename.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/rename.c… ============================================================================== --- trunk/reactos/dll/win32/wldap32/rename.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/rename.c [iso-8859-1] Sun Jan 11 13:02:16 2009 @@ -157,8 +157,8 @@ if (!clientctrlsU) goto exit; } - ret = ldap_rename( ld, dn ? dnU : "", newrdn ? newrdnU : "", newparentU, - delete, serverctrlsU, clientctrlsU, (int *)message ); + ret = map_error( ldap_rename( ld, dn ? dnU : "", newrdn ? newrdnU : "", newparentU, + delete, serverctrlsU, clientctrlsU, (int *)message )); exit: strfreeU( dnU ); @@ -283,8 +283,8 @@ if (!clientctrlsU) goto exit; } - ret = ldap_rename_s( ld, dn ? dnU : "", newrdn ? newrdnU : "", newparentU, - delete, serverctrlsU, clientctrlsU ); + ret = map_error( ldap_rename_s( ld, dn ? dnU : "", newrdn ? newrdnU : "", newparentU, + delete, serverctrlsU, clientctrlsU )); exit: strfreeU( dnU ); Modified: trunk/reactos/dll/win32/wldap32/search.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/search.c… ============================================================================== --- trunk/reactos/dll/win32/wldap32/search.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/search.c [iso-8859-1] Sun Jan 11 13:02:16 2009 @@ -55,7 +55,7 @@ TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x)\n", ld, debugstr_a(base), scope, debugstr_a(filter), attrs, attrsonly ); - if (!ld) return ~0UL; + if (!ld) return ~0u; if (base) { baseW = strAtoW( base ); @@ -97,7 +97,7 @@ * * RETURNS * Success: Message ID of the search operation. - * Failure: ~0UL + * Failure: ~0u * * NOTES * Call ldap_result with the message ID to get the result of @@ -117,7 +117,7 @@ TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x)\n", ld, debugstr_w(base), scope, debugstr_w(filter), attrs, attrsonly ); - if (!ld) return ~0UL; + if (!ld) return ~0u; if (base) { baseU = strWtoU( base ); @@ -138,7 +138,7 @@ if (ret == LDAP_SUCCESS) ret = msg; else - ret = ~0UL; + ret = ~0u; exit: strfreeU( baseU ); @@ -251,7 +251,7 @@ ld, debugstr_w(base), scope, debugstr_w(filter), attrs, attrsonly, serverctrls, clientctrls, timelimit, sizelimit, message ); - if (!ld) return ~0UL; + if (!ld) return ~0u; if (base) { baseU = strWtoU( base ); @@ -277,8 +277,8 @@ tv.tv_sec = timelimit; tv.tv_usec = 0; - ret = ldap_search_ext( ld, baseU, scope, filterU, attrsU, attrsonly, - serverctrlsU, clientctrlsU, &tv, sizelimit, (int *)message ); + ret = map_error( ldap_search_ext( ld, baseU, scope, filterU, attrsU, attrsonly, + serverctrlsU, clientctrlsU, &tv, sizelimit, (int *)message )); exit: strfreeU( baseU ); @@ -412,8 +412,9 @@ if (!clientctrlsU) goto exit; } - ret = ldap_search_ext_s( ld, baseU, scope, filterU, attrsU, attrsonly, - serverctrlsU, clientctrlsU, (struct timeval *)timeout, sizelimit, res ); + ret = map_error( ldap_search_ext_s( ld, baseU, scope, filterU, attrsU, attrsonly, + serverctrlsU, clientctrlsU, (struct timeval *)timeout, + sizelimit, res )); exit: strfreeU( baseU ); @@ -518,8 +519,8 @@ if (!attrsU) goto exit; } - ret = ldap_search_ext_s( ld, baseU, scope, filterU, attrsU, attrsonly, - NULL, NULL, NULL, 0, res ); + ret = map_error( ldap_search_ext_s( ld, baseU, scope, filterU, attrsU, attrsonly, + NULL, NULL, NULL, 0, res )); exit: strfreeU( baseU ); @@ -628,8 +629,8 @@ if (!attrsU) goto exit; } - ret = ldap_search_ext_s( ld, baseU, scope, filterU, attrsU, attrsonly, - NULL, NULL, (struct timeval *)timeout, 0, res ); + ret = map_error( ldap_search_ext_s( ld, baseU, scope, filterU, attrsU, attrsonly, + NULL, NULL, (struct timeval *)timeout, 0, res )); exit: strfreeU( baseU ); Modified: trunk/reactos/dll/win32/wldap32/winldap_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/winldap_… ============================================================================== --- trunk/reactos/dll/win32/wldap32/winldap_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/winldap_private.h [iso-8859-1] Sun Jan 11 13:02:16 2009 @@ -276,183 +276,183 @@ int ldapaif_version; } LDAPAPIFeatureInfoW; -WLDAP32_LDAP *cldap_openA(PCHAR,ULONG); -WLDAP32_LDAP *cldap_openW(PWCHAR,ULONG); -ULONG WLDAP32_ldap_abandon(WLDAP32_LDAP*,ULONG); -ULONG ldap_addA(WLDAP32_LDAP*,PCHAR,LDAPModA*[]); -ULONG ldap_addW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[]); -ULONG ldap_add_extA(WLDAP32_LDAP*,PCHAR,LDAPModA*[],PLDAPControlA*,PLDAPControlA*,ULONG*); -ULONG ldap_add_extW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[],PLDAPControlW*,PLDAPControlW*,ULONG*); -ULONG ldap_add_ext_sA(WLDAP32_LDAP*,PCHAR,LDAPModA*[],PLDAPControlA*,PLDAPControlA*); -ULONG ldap_add_ext_sW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[],PLDAPControlW*,PLDAPControlW*); -ULONG ldap_add_sA(WLDAP32_LDAP*,PCHAR,LDAPModA*[]); -ULONG ldap_add_sW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[]); -ULONG ldap_bindA(WLDAP32_LDAP*,PCHAR,PCHAR,ULONG); -ULONG ldap_bindW(WLDAP32_LDAP*,PWCHAR,PWCHAR,ULONG); -ULONG ldap_bind_sA(WLDAP32_LDAP*,PCHAR,PCHAR,ULONG); -ULONG ldap_bind_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,ULONG); -ULONG ldap_check_filterA(WLDAP32_LDAP*,PCHAR); -ULONG ldap_check_filterW(WLDAP32_LDAP*,PWCHAR); -ULONG ldap_cleanup(HANDLE); -ULONG ldap_close_extended_op(WLDAP32_LDAP*,ULONG); -ULONG ldap_compareA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR); -ULONG ldap_compareW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR); -ULONG ldap_compare_extA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR,struct WLDAP32_berval*,PLDAPControlA*,PLDAPControlA*,ULONG*); -ULONG ldap_compare_extW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,struct WLDAP32_berval*,PLDAPControlW*,PLDAPControlW*,ULONG*); -ULONG ldap_compare_ext_sA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR,struct WLDAP32_berval*,PLDAPControlA*,PLDAPControlA*); -ULONG ldap_compare_ext_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,struct WLDAP32_berval*,PLDAPControlW*,PLDAPControlW*); -ULONG ldap_compare_sA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR); -ULONG ldap_compare_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR); -ULONG ldap_connect(WLDAP32_LDAP*,LDAP_TIMEVAL*); -WLDAP32_LDAP *ldap_conn_from_msg(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); -ULONG ldap_control_freeA(LDAPControlA*); -ULONG ldap_control_freeW(LDAPControlW*); -ULONG ldap_controls_freeA(LDAPControlA**); -ULONG ldap_controls_freeW(LDAPControlW**); -ULONG WLDAP32_ldap_count_entries(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); -ULONG WLDAP32_ldap_count_references(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); -ULONG ldap_count_valuesA(PCHAR*); -ULONG ldap_count_valuesW(PWCHAR*); -ULONG WLDAP32_ldap_count_values_len(PBERVAL*); -ULONG ldap_create_page_controlA(WLDAP32_PLDAP,ULONG,struct WLDAP32_berval*,UCHAR,PLDAPControlA*); -ULONG ldap_create_page_controlW(WLDAP32_PLDAP,ULONG,struct WLDAP32_berval*,UCHAR,PLDAPControlW*); -ULONG ldap_create_sort_controlA(WLDAP32_PLDAP,PLDAPSortKeyA*,UCHAR,PLDAPControlA*); -ULONG ldap_create_sort_controlW(WLDAP32_PLDAP,PLDAPSortKeyW*,UCHAR,PLDAPControlW*); -INT ldap_create_vlv_controlA(WLDAP32_LDAP*,WLDAP32_LDAPVLVInfo*,UCHAR,LDAPControlA**); -INT ldap_create_vlv_controlW(WLDAP32_LDAP*,WLDAP32_LDAPVLVInfo*,UCHAR,LDAPControlW**); -ULONG ldap_deleteA(WLDAP32_LDAP*,PCHAR); -ULONG ldap_deleteW(WLDAP32_LDAP*,PWCHAR); -ULONG ldap_delete_extA(WLDAP32_LDAP*,PCHAR,PLDAPControlA*,PLDAPControlA*,ULONG*); -ULONG ldap_delete_extW(WLDAP32_LDAP*,PWCHAR,PLDAPControlW*,PLDAPControlW*,ULONG*); -ULONG ldap_delete_ext_sA(WLDAP32_LDAP*,PCHAR,PLDAPControlA*,PLDAPControlA*); -ULONG ldap_delete_ext_sW(WLDAP32_LDAP*,PWCHAR,PLDAPControlW*,PLDAPControlW*); -ULONG ldap_delete_sA(WLDAP32_LDAP*,PCHAR); -ULONG ldap_delete_sW(WLDAP32_LDAP*,PWCHAR); -PCHAR ldap_dn2ufnA(PCHAR); -PWCHAR ldap_dn2ufnW(PWCHAR); -ULONG ldap_encode_sort_controlA(WLDAP32_PLDAP,PLDAPSortKeyA*,PLDAPControlA,BOOLEAN); -ULONG ldap_encode_sort_controlW(WLDAP32_PLDAP,PLDAPSortKeyW*,PLDAPControlW,BOOLEAN); -PCHAR ldap_err2stringA(ULONG); -PWCHAR ldap_err2stringW(ULONG); -ULONG ldap_escape_filter_elementA(PCHAR,ULONG,PCHAR,ULONG); -ULONG ldap_escape_filter_elementW(PCHAR,ULONG,PWCHAR,ULONG); -PCHAR *ldap_explode_dnA(PCHAR,ULONG); -PWCHAR *ldap_explode_dnW(PWCHAR,ULONG); -ULONG ldap_extended_operationA(WLDAP32_LDAP*,PCHAR,struct WLDAP32_berval*,PLDAPControlA*,PLDAPControlA*,ULONG*); -ULONG ldap_extended_operationW(WLDAP32_LDAP*,PWCHAR,struct WLDAP32_berval*,PLDAPControlW*,PLDAPControlW*,ULONG*); -ULONG ldap_extended_operation_sA(WLDAP32_LDAP*,PCHAR,struct WLDAP32_berval*,PLDAPControlA*, PLDAPControlA*, +WLDAP32_LDAP CDECL *cldap_openA(PCHAR,ULONG); +WLDAP32_LDAP CDECL *cldap_openW(PWCHAR,ULONG); +ULONG CDECL WLDAP32_ldap_abandon(WLDAP32_LDAP*,ULONG); +ULONG CDECL ldap_addA(WLDAP32_LDAP*,PCHAR,LDAPModA*[]); +ULONG CDECL ldap_addW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[]); +ULONG CDECL ldap_add_extA(WLDAP32_LDAP*,PCHAR,LDAPModA*[],PLDAPControlA*,PLDAPControlA*,ULONG*); +ULONG CDECL ldap_add_extW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[],PLDAPControlW*,PLDAPControlW*,ULONG*); +ULONG CDECL ldap_add_ext_sA(WLDAP32_LDAP*,PCHAR,LDAPModA*[],PLDAPControlA*,PLDAPControlA*); +ULONG CDECL ldap_add_ext_sW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[],PLDAPControlW*,PLDAPControlW*); +ULONG CDECL ldap_add_sA(WLDAP32_LDAP*,PCHAR,LDAPModA*[]); +ULONG CDECL ldap_add_sW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[]); +ULONG CDECL ldap_bindA(WLDAP32_LDAP*,PCHAR,PCHAR,ULONG); +ULONG CDECL ldap_bindW(WLDAP32_LDAP*,PWCHAR,PWCHAR,ULONG); +ULONG CDECL ldap_bind_sA(WLDAP32_LDAP*,PCHAR,PCHAR,ULONG); +ULONG CDECL ldap_bind_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,ULONG); +ULONG CDECL ldap_check_filterA(WLDAP32_LDAP*,PCHAR); +ULONG CDECL ldap_check_filterW(WLDAP32_LDAP*,PWCHAR); +ULONG CDECL ldap_cleanup(HANDLE); +ULONG CDECL ldap_close_extended_op(WLDAP32_LDAP*,ULONG); +ULONG CDECL ldap_compareA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR); +ULONG CDECL ldap_compareW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR); +ULONG CDECL ldap_compare_extA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR,struct WLDAP32_berval*,PLDAPControlA*,PLDAPControlA*,ULONG*); +ULONG CDECL ldap_compare_extW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,struct WLDAP32_berval*,PLDAPControlW*,PLDAPControlW*,ULONG*); +ULONG CDECL ldap_compare_ext_sA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR,struct WLDAP32_berval*,PLDAPControlA*,PLDAPControlA*); +ULONG CDECL ldap_compare_ext_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,struct WLDAP32_berval*,PLDAPControlW*,PLDAPControlW*); +ULONG CDECL ldap_compare_sA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR); +ULONG CDECL ldap_compare_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR); +ULONG CDECL ldap_connect(WLDAP32_LDAP*,LDAP_TIMEVAL*); +WLDAP32_LDAP CDECL *ldap_conn_from_msg(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); +ULONG CDECL ldap_control_freeA(LDAPControlA*); +ULONG CDECL ldap_control_freeW(LDAPControlW*); +ULONG CDECL ldap_controls_freeA(LDAPControlA**); +ULONG CDECL ldap_controls_freeW(LDAPControlW**); +ULONG CDECL WLDAP32_ldap_count_entries(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); +ULONG CDECL WLDAP32_ldap_count_references(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); +ULONG CDECL ldap_count_valuesA(PCHAR*); +ULONG CDECL ldap_count_valuesW(PWCHAR*); +ULONG CDECL WLDAP32_ldap_count_values_len(PBERVAL*); +ULONG CDECL ldap_create_page_controlA(WLDAP32_PLDAP,ULONG,struct WLDAP32_berval*,UCHAR,PLDAPControlA*); +ULONG CDECL ldap_create_page_controlW(WLDAP32_PLDAP,ULONG,struct WLDAP32_berval*,UCHAR,PLDAPControlW*); +ULONG CDECL ldap_create_sort_controlA(WLDAP32_PLDAP,PLDAPSortKeyA*,UCHAR,PLDAPControlA*); +ULONG CDECL ldap_create_sort_controlW(WLDAP32_PLDAP,PLDAPSortKeyW*,UCHAR,PLDAPControlW*); +INT CDECL ldap_create_vlv_controlA(WLDAP32_LDAP*,WLDAP32_LDAPVLVInfo*,UCHAR,LDAPControlA**); +INT CDECL ldap_create_vlv_controlW(WLDAP32_LDAP*,WLDAP32_LDAPVLVInfo*,UCHAR,LDAPControlW**); +ULONG CDECL ldap_deleteA(WLDAP32_LDAP*,PCHAR); +ULONG CDECL ldap_deleteW(WLDAP32_LDAP*,PWCHAR); +ULONG CDECL ldap_delete_extA(WLDAP32_LDAP*,PCHAR,PLDAPControlA*,PLDAPControlA*,ULONG*); +ULONG CDECL ldap_delete_extW(WLDAP32_LDAP*,PWCHAR,PLDAPControlW*,PLDAPControlW*,ULONG*); +ULONG CDECL ldap_delete_ext_sA(WLDAP32_LDAP*,PCHAR,PLDAPControlA*,PLDAPControlA*); +ULONG CDECL ldap_delete_ext_sW(WLDAP32_LDAP*,PWCHAR,PLDAPControlW*,PLDAPControlW*); +ULONG CDECL ldap_delete_sA(WLDAP32_LDAP*,PCHAR); +ULONG CDECL ldap_delete_sW(WLDAP32_LDAP*,PWCHAR); +PCHAR CDECL ldap_dn2ufnA(PCHAR); +PWCHAR CDECL ldap_dn2ufnW(PWCHAR); +ULONG CDECL ldap_encode_sort_controlA(WLDAP32_PLDAP,PLDAPSortKeyA*,PLDAPControlA,BOOLEAN); +ULONG CDECL ldap_encode_sort_controlW(WLDAP32_PLDAP,PLDAPSortKeyW*,PLDAPControlW,BOOLEAN); +PCHAR CDECL ldap_err2stringA(ULONG); +PWCHAR CDECL ldap_err2stringW(ULONG); +ULONG CDECL ldap_escape_filter_elementA(PCHAR,ULONG,PCHAR,ULONG); +ULONG CDECL ldap_escape_filter_elementW(PCHAR,ULONG,PWCHAR,ULONG); +PCHAR CDECL *ldap_explode_dnA(PCHAR,ULONG); +PWCHAR CDECL *ldap_explode_dnW(PWCHAR,ULONG); +ULONG CDECL ldap_extended_operationA(WLDAP32_LDAP*,PCHAR,struct WLDAP32_berval*,PLDAPControlA*,PLDAPControlA*,ULONG*); +ULONG CDECL ldap_extended_operationW(WLDAP32_LDAP*,PWCHAR,struct WLDAP32_berval*,PLDAPControlW*,PLDAPControlW*,ULONG*); +ULONG CDECL ldap_extended_operation_sA(WLDAP32_LDAP*,PCHAR,struct WLDAP32_berval*,PLDAPControlA*, PLDAPControlA*, PCHAR*,struct WLDAP32_berval**); -ULONG ldap_extended_operation_sW(WLDAP32_LDAP*,PWCHAR,struct WLDAP32_berval*,PLDAPControlW*, PLDAPControlW*, +ULONG CDECL ldap_extended_operation_sW(WLDAP32_LDAP*,PWCHAR,struct WLDAP32_berval*,PLDAPControlW*, PLDAPControlW*, PWCHAR*,struct WLDAP32_berval**); -PCHAR ldap_first_attributeA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement**); -PWCHAR ldap_first_attributeW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement**); -WLDAP32_LDAPMessage *WLDAP32_ldap_first_entry(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); -WLDAP32_LDAPMessage *WLDAP32_ldap_first_reference(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); -ULONG ldap_free_controlsA(LDAPControlA**); -ULONG ldap_free_controlsW(LDAPControlW**); -PCHAR ldap_get_dnA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); -PWCHAR ldap_get_dnW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); -ULONG ldap_get_next_page(WLDAP32_LDAP*,PLDAPSearch,ULONG,ULONG*); -ULONG ldap_get_next_page_s(WLDAP32_LDAP*,PLDAPSearch,struct l_timeval*,ULONG,ULONG*,WLDAP32_LDAPMessage**); -ULONG ldap_get_optionA(WLDAP32_LDAP*,int,void*); -ULONG ldap_get_optionW(WLDAP32_LDAP*,int,void*); -ULONG ldap_get_paged_count(WLDAP32_LDAP*,PLDAPSearch,ULONG*,WLDAP32_LDAPMessage*); -PCHAR *ldap_get_valuesA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR); -PWCHAR *ldap_get_valuesW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR); -PBERVAL *ldap_get_values_lenA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR); -PBERVAL *ldap_get_values_lenW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR); -WLDAP32_LDAP *ldap_initA(const PCHAR,ULONG); -WLDAP32_LDAP *ldap_initW(const PWCHAR,ULONG); -void ldap_memfreeA(PCHAR); -void ldap_memfreeW(PWCHAR); -ULONG ldap_modifyA(WLDAP32_LDAP*,PCHAR,LDAPModA*[]); -ULONG ldap_modifyW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[]); -ULONG ldap_modify_extA(WLDAP32_LDAP*,PCHAR,LDAPModA*[],PLDAPControlA*,PLDAPControlA*,ULONG*); -ULONG ldap_modify_extW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[],PLDAPControlW*,PLDAPControlW*,ULONG*); -ULONG ldap_modify_ext_sA(WLDAP32_LDAP*,PCHAR,LDAPModA*[],PLDAPControlA*,PLDAPControlA*); -ULONG ldap_modify_ext_sW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[],PLDAPControlW*,PLDAPControlW*); -ULONG ldap_modify_sA(WLDAP32_LDAP*,PCHAR,LDAPModA*[]); -ULONG ldap_modify_sW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[]); -ULONG ldap_modrdnA(WLDAP32_LDAP*,PCHAR,PCHAR); -ULONG ldap_modrdnW(WLDAP32_LDAP*,PWCHAR,PWCHAR); -ULONG ldap_modrdn2A(WLDAP32_LDAP*,PCHAR,PCHAR,INT); -ULONG ldap_modrdn2W(WLDAP32_LDAP*,PWCHAR,PWCHAR,INT); -ULONG ldap_modrdn2_sA(WLDAP32_LDAP*,PCHAR,PCHAR,INT); -ULONG ldap_modrdn2_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,INT); -ULONG ldap_modrdn_sA(WLDAP32_LDAP*,PCHAR,PCHAR); -ULONG ldap_modrdn_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR); -ULONG WLDAP32_ldap_msgfree(WLDAP32_LDAPMessage*); -PCHAR ldap_next_attributeA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement*); -PWCHAR ldap_next_attributeW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement*); -WLDAP32_LDAPMessage *WLDAP32_ldap_next_entry(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); -WLDAP32_LDAPMessage *WLDAP32_ldap_next_reference(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); -WLDAP32_LDAP *ldap_openA(PCHAR,ULONG); -WLDAP32_LDAP *ldap_openW(PWCHAR,ULONG); -ULONG ldap_parse_extended_resultA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR*,struct WLDAP32_berval**,BOOLEAN); -ULONG ldap_parse_extended_resultW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR*,struct WLDAP32_berval**,BOOLEAN); -ULONG ldap_parse_page_controlA(WLDAP32_LDAP*,PLDAPControlA*,ULONG*,struct WLDAP32_berval**); -ULONG ldap_parse_page_controlW(WLDAP32_LDAP*,PLDAPControlW*,ULONG*,struct WLDAP32_berval**); -ULONG ldap_parse_referenceA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR**); -ULONG ldap_parse_referenceW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR**); -ULONG ldap_parse_resultA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,ULONG*,PCHAR*,PCHAR*,PCHAR**,PLDAPControlA**,BOOLEAN); -ULONG ldap_parse_resultW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,ULONG*,PWCHAR*,PWCHAR*,PWCHAR**,PLDAPControlW**,BOOLEAN); -ULONG ldap_parse_sort_controlA(WLDAP32_LDAP*,PLDAPControlA*,ULONG*,PCHAR*); -ULONG ldap_parse_sort_controlW(WLDAP32_LDAP*,PLDAPControlW*,ULONG*,PWCHAR*); -int ldap_parse_vlv_controlA(WLDAP32_LDAP*,LDAPControlA**,ULONG*,ULONG*,struct WLDAP32_berval**,INT*); -int ldap_parse_vlv_controlW(WLDAP32_LDAP*,LDAPControlW**,ULONG*,ULONG*,struct WLDAP32_berval**,INT*); -void WLDAP32_ldap_perror(WLDAP32_LDAP*,const PCHAR); -ULONG ldap_rename_extA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR,INT,PLDAPControlA*,PLDAPControlA*,ULONG*); -ULONG ldap_rename_extW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,INT,PLDAPControlW*,PLDAPControlW*,ULONG*); -ULONG ldap_rename_ext_sA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR,INT,PLDAPControlA*,PLDAPControlA*); -ULONG ldap_rename_ext_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,INT,PLDAPControlW*,PLDAPControlW*); -ULONG WLDAP32_ldap_result(WLDAP32_LDAP*,ULONG,ULONG,struct l_timeval*,WLDAP32_LDAPMessage**); -ULONG WLDAP32_ldap_result2error(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,ULONG); -ULONG ldap_sasl_bindA(WLDAP32_LDAP*,const PCHAR,const PCHAR,const BERVAL*,PLDAPControlA*,PLDAPControlA*,int*); -ULONG ldap_sasl_bindW(WLDAP32_LDAP*,const PWCHAR,const PWCHAR,const BERVAL*,PLDAPControlW*,PLDAPControlW*,int*); -ULONG ldap_sasl_bind_sA(WLDAP32_LDAP*,const PCHAR,const PCHAR,const BERVAL*,PLDAPControlA*,PLDAPControlA*,PBERVAL*); -ULONG ldap_sasl_bind_sW(WLDAP32_LDAP*,const PWCHAR,const PWCHAR,const BERVAL*,PLDAPControlW*,PLDAPControlW*,PBERVAL*); -ULONG ldap_search_abandon_page(WLDAP32_PLDAP,PLDAPSearch); -ULONG ldap_searchA(WLDAP32_LDAP*,PCHAR,ULONG,PCHAR,PCHAR[],ULONG); -ULONG ldap_searchW(WLDAP32_LDAP*,PWCHAR,ULONG,PWCHAR,PWCHAR[],ULONG); -ULONG ldap_search_extA(WLDAP32_LDAP*,PCHAR,ULONG,PCHAR,PCHAR[],ULONG,PLDAPControlA*, +PCHAR CDECL ldap_first_attributeA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement**); +PWCHAR CDECL ldap_first_attributeW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement**); +WLDAP32_LDAPMessage CDECL *WLDAP32_ldap_first_entry(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); +WLDAP32_LDAPMessage CDECL *WLDAP32_ldap_first_reference(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); +ULONG CDECL ldap_free_controlsA(LDAPControlA**); +ULONG CDECL ldap_free_controlsW(LDAPControlW**); +PCHAR CDECL ldap_get_dnA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); +PWCHAR CDECL ldap_get_dnW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); +ULONG CDECL ldap_get_next_page(WLDAP32_LDAP*,PLDAPSearch,ULONG,ULONG*); +ULONG CDECL ldap_get_next_page_s(WLDAP32_LDAP*,PLDAPSearch,struct l_timeval*,ULONG,ULONG*,WLDAP32_LDAPMessage**); +ULONG CDECL ldap_get_optionA(WLDAP32_LDAP*,int,void*); +ULONG CDECL ldap_get_optionW(WLDAP32_LDAP*,int,void*); +ULONG CDECL ldap_get_paged_count(WLDAP32_LDAP*,PLDAPSearch,ULONG*,WLDAP32_LDAPMessage*); +PCHAR CDECL *ldap_get_valuesA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR); +PWCHAR CDECL *ldap_get_valuesW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR); +PBERVAL CDECL *ldap_get_values_lenA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR); +PBERVAL CDECL *ldap_get_values_lenW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR); +WLDAP32_LDAP CDECL *ldap_initA(const PCHAR,ULONG); +WLDAP32_LDAP CDECL *ldap_initW(const PWCHAR,ULONG); +void CDECL ldap_memfreeA(PCHAR); +void CDECL ldap_memfreeW(PWCHAR); +ULONG CDECL ldap_modifyA(WLDAP32_LDAP*,PCHAR,LDAPModA*[]); +ULONG CDECL ldap_modifyW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[]); +ULONG CDECL ldap_modify_extA(WLDAP32_LDAP*,PCHAR,LDAPModA*[],PLDAPControlA*,PLDAPControlA*,ULONG*); +ULONG CDECL ldap_modify_extW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[],PLDAPControlW*,PLDAPControlW*,ULONG*); +ULONG CDECL ldap_modify_ext_sA(WLDAP32_LDAP*,PCHAR,LDAPModA*[],PLDAPControlA*,PLDAPControlA*); +ULONG CDECL ldap_modify_ext_sW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[],PLDAPControlW*,PLDAPControlW*); +ULONG CDECL ldap_modify_sA(WLDAP32_LDAP*,PCHAR,LDAPModA*[]); +ULONG CDECL ldap_modify_sW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[]); +ULONG CDECL ldap_modrdnA(WLDAP32_LDAP*,PCHAR,PCHAR); +ULONG CDECL ldap_modrdnW(WLDAP32_LDAP*,PWCHAR,PWCHAR); +ULONG CDECL ldap_modrdn2A(WLDAP32_LDAP*,PCHAR,PCHAR,INT); +ULONG CDECL ldap_modrdn2W(WLDAP32_LDAP*,PWCHAR,PWCHAR,INT); +ULONG CDECL ldap_modrdn2_sA(WLDAP32_LDAP*,PCHAR,PCHAR,INT); +ULONG CDECL ldap_modrdn2_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,INT); +ULONG CDECL ldap_modrdn_sA(WLDAP32_LDAP*,PCHAR,PCHAR); +ULONG CDECL ldap_modrdn_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR); +ULONG CDECL WLDAP32_ldap_msgfree(WLDAP32_LDAPMessage*); +PCHAR CDECL ldap_next_attributeA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement*); +PWCHAR CDECL ldap_next_attributeW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement*); +WLDAP32_LDAPMessage CDECL *WLDAP32_ldap_next_entry(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); +WLDAP32_LDAPMessage CDECL *WLDAP32_ldap_next_reference(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); +WLDAP32_LDAP CDECL *ldap_openA(PCHAR,ULONG); +WLDAP32_LDAP CDECL *ldap_openW(PWCHAR,ULONG); +ULONG CDECL ldap_parse_extended_resultA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR*,struct WLDAP32_berval**,BOOLEAN); +ULONG CDECL ldap_parse_extended_resultW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR*,struct WLDAP32_berval**,BOOLEAN); +ULONG CDECL ldap_parse_page_controlA(WLDAP32_LDAP*,PLDAPControlA*,ULONG*,struct WLDAP32_berval**); +ULONG CDECL ldap_parse_page_controlW(WLDAP32_LDAP*,PLDAPControlW*,ULONG*,struct WLDAP32_berval**); +ULONG CDECL ldap_parse_referenceA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR**); +ULONG CDECL ldap_parse_referenceW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR**); +ULONG CDECL ldap_parse_resultA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,ULONG*,PCHAR*,PCHAR*,PCHAR**,PLDAPControlA**,BOOLEAN); +ULONG CDECL ldap_parse_resultW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,ULONG*,PWCHAR*,PWCHAR*,PWCHAR**,PLDAPControlW**,BOOLEAN); +ULONG CDECL ldap_parse_sort_controlA(WLDAP32_LDAP*,PLDAPControlA*,ULONG*,PCHAR*); +ULONG CDECL ldap_parse_sort_controlW(WLDAP32_LDAP*,PLDAPControlW*,ULONG*,PWCHAR*); +int CDECL ldap_parse_vlv_controlA(WLDAP32_LDAP*,LDAPControlA**,ULONG*,ULONG*,struct WLDAP32_berval**,INT*); +int CDECL ldap_parse_vlv_controlW(WLDAP32_LDAP*,LDAPControlW**,ULONG*,ULONG*,struct WLDAP32_berval**,INT*); +void CDECL WLDAP32_ldap_perror(WLDAP32_LDAP*,const PCHAR); +ULONG CDECL ldap_rename_extA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR,INT,PLDAPControlA*,PLDAPControlA*,ULONG*); +ULONG CDECL ldap_rename_extW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,INT,PLDAPControlW*,PLDAPControlW*,ULONG*); +ULONG CDECL ldap_rename_ext_sA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR,INT,PLDAPControlA*,PLDAPControlA*); +ULONG CDECL ldap_rename_ext_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,INT,PLDAPControlW*,PLDAPControlW*); +ULONG CDECL WLDAP32_ldap_result(WLDAP32_LDAP*,ULONG,ULONG,struct l_timeval*,WLDAP32_LDAPMessage**); +ULONG CDECL WLDAP32_ldap_result2error(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,ULONG); +ULONG CDECL ldap_sasl_bindA(WLDAP32_LDAP*,const PCHAR,const PCHAR,const BERVAL*,PLDAPControlA*,PLDAPControlA*,int*); +ULONG CDECL ldap_sasl_bindW(WLDAP32_LDAP*,const PWCHAR,const PWCHAR,const BERVAL*,PLDAPControlW*,PLDAPControlW*,int*); +ULONG CDECL ldap_sasl_bind_sA(WLDAP32_LDAP*,const PCHAR,const PCHAR,const BERVAL*,PLDAPControlA*,PLDAPControlA*,PBERVAL*); +ULONG CDECL ldap_sasl_bind_sW(WLDAP32_LDAP*,const PWCHAR,const PWCHAR,const BERVAL*,PLDAPControlW*,PLDAPControlW*,PBERVAL*); +ULONG CDECL ldap_search_abandon_page(WLDAP32_PLDAP,PLDAPSearch); +ULONG CDECL ldap_searchA(WLDAP32_LDAP*,PCHAR,ULONG,PCHAR,PCHAR[],ULONG); +ULONG CDECL ldap_searchW(WLDAP32_LDAP*,PWCHAR,ULONG,PWCHAR,PWCHAR[],ULONG); +ULONG CDECL ldap_search_extA(WLDAP32_LDAP*,PCHAR,ULONG,PCHAR,PCHAR[],ULONG,PLDAPControlA*, PLDAPControlA*,ULONG,ULONG,ULONG*); -ULONG ldap_search_extW(WLDAP32_LDAP*,PWCHAR,ULONG,PWCHAR,PWCHAR[],ULONG,PLDAPControlW*, +ULONG CDECL ldap_search_extW(WLDAP32_LDAP*,PWCHAR,ULONG,PWCHAR,PWCHAR[],ULONG,PLDAPControlW*, PLDAPControlW*,ULONG,ULONG,ULONG*); -ULONG ldap_search_ext_sA(WLDAP32_LDAP*,PCHAR,ULONG,PCHAR,PCHAR[],ULONG,PLDAPControlA*, +ULONG CDECL ldap_search_ext_sA(WLDAP32_LDAP*,PCHAR,ULONG,PCHAR,PCHAR[],ULONG,PLDAPControlA*, PLDAPControlA*,struct l_timeval*,ULONG,WLDAP32_LDAPMessage**); -ULONG ldap_search_ext_sW(WLDAP32_LDAP*,PWCHAR,ULONG,PWCHAR,PWCHAR[],ULONG,PLDAPControlW*, +ULONG CDECL ldap_search_ext_sW(WLDAP32_LDAP*,PWCHAR,ULONG,PWCHAR,PWCHAR[],ULONG,PLDAPControlW*, PLDAPControlW*,struct l_timeval*,ULONG,WLDAP32_LDAPMessage**); -PLDAPSearch ldap_search_init_pageA(WLDAP32_PLDAP,PCHAR,ULONG,PCHAR,PCHAR[],ULONG,PLDAPControlA*, +PLDAPSearch CDECL ldap_search_init_pageA(WLDAP32_PLDAP,PCHAR,ULONG,PCHAR,PCHAR[],ULONG,PLDAPControlA*, PLDAPControlA*,ULONG,ULONG,PLDAPSortKeyA*); -PLDAPSearch ldap_search_init_pageW(WLDAP32_PLDAP,PWCHAR,ULONG,PWCHAR,PWCHAR[],ULONG,PLDAPControlW*, +PLDAPSearch CDECL ldap_search_init_pageW(WLDAP32_PLDAP,PWCHAR,ULONG,PWCHAR,PWCHAR[],ULONG,PLDAPControlW*, PLDAPControlW*,ULONG,ULONG, PLDAPSortKeyW*); -ULONG ldap_search_sA(WLDAP32_LDAP*,PCHAR,ULONG,PCHAR,PCHAR[],ULONG,WLDAP32_LDAPMessage**); -ULONG ldap_search_sW(WLDAP32_LDAP*,PWCHAR,ULONG,PWCHAR,PWCHAR[],ULONG,WLDAP32_LDAPMessage**); -ULONG ldap_search_stA(WLDAP32_LDAP*,const PCHAR,ULONG,const PCHAR,PCHAR[],ULONG, +ULONG CDECL ldap_search_sA(WLDAP32_LDAP*,PCHAR,ULONG,PCHAR,PCHAR[],ULONG,WLDAP32_LDAPMessage**); +ULONG CDECL ldap_search_sW(WLDAP32_LDAP*,PWCHAR,ULONG,PWCHAR,PWCHAR[],ULONG,WLDAP32_LDAPMessage**); +ULONG CDECL ldap_search_stA(WLDAP32_LDAP*,const PCHAR,ULONG,const PCHAR,PCHAR[],ULONG, struct l_timeval*,WLDAP32_LDAPMessage**); -ULONG ldap_search_stW(WLDAP32_LDAP*,const PWCHAR,ULONG,const PWCHAR,PWCHAR[],ULONG, +ULONG CDECL ldap_search_stW(WLDAP32_LDAP*,const PWCHAR,ULONG,const PWCHAR,PWCHAR[],ULONG, struct l_timeval*,WLDAP32_LDAPMessage**); -ULONG ldap_set_optionA(WLDAP32_LDAP*,int,void*); -ULONG ldap_set_optionW(WLDAP32_LDAP*,int,void*); -ULONG ldap_simple_bindA(WLDAP32_LDAP*,PCHAR,PCHAR); -ULONG ldap_simple_bindW(WLDAP32_LDAP*,PWCHAR,PWCHAR); -ULONG ldap_simple_bind_sA(WLDAP32_LDAP*,PCHAR,PCHAR); -ULONG ldap_simple_bind_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR); -WLDAP32_LDAP *ldap_sslinitA(PCHAR,ULONG,int); -WLDAP32_LDAP *ldap_sslinitW(PWCHAR,ULONG,int); -ULONG ldap_start_tls_sA(WLDAP32_PLDAP,PULONG,WLDAP32_LDAPMessage**,PLDAPControlA*,PLDAPControlA*); -ULONG ldap_start_tls_sW(WLDAP32_PLDAP,PULONG,WLDAP32_LDAPMessage**,PLDAPControlW*,PLDAPControlW*); -ULONG ldap_startup(PLDAP_VERSION_INFO,HANDLE*); -BOOLEAN ldap_stop_tls_s(WLDAP32_PLDAP); -ULONG ldap_ufn2dnA(PCHAR,PCHAR*); -ULONG ldap_ufn2dnW(PWCHAR,PWCHAR*); -ULONG WLDAP32_ldap_unbind(WLDAP32_LDAP*); -ULONG WLDAP32_ldap_unbind_s(WLDAP32_LDAP*); -ULONG ldap_value_freeA(PCHAR*); -ULONG ldap_value_freeW(PWCHAR*); -ULONG WLDAP32_ldap_value_free_len(struct WLDAP32_berval**); - -ULONG LdapGetLastError(void); -ULONG LdapMapErrorToWin32(ULONG); -int LdapUnicodeToUTF8(LPCWSTR,int,LPSTR,int); -int LdapUTF8ToUnicode(LPCSTR,int,LPWSTR,int); +ULONG CDECL ldap_set_optionA(WLDAP32_LDAP*,int,void*); +ULONG CDECL ldap_set_optionW(WLDAP32_LDAP*,int,void*); +ULONG CDECL ldap_simple_bindA(WLDAP32_LDAP*,PCHAR,PCHAR); +ULONG CDECL ldap_simple_bindW(WLDAP32_LDAP*,PWCHAR,PWCHAR); +ULONG CDECL ldap_simple_bind_sA(WLDAP32_LDAP*,PCHAR,PCHAR); +ULONG CDECL ldap_simple_bind_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR); +WLDAP32_LDAP CDECL *ldap_sslinitA(PCHAR,ULONG,int); +WLDAP32_LDAP CDECL *ldap_sslinitW(PWCHAR,ULONG,int); +ULONG CDECL ldap_start_tls_sA(WLDAP32_PLDAP,PULONG,WLDAP32_LDAPMessage**,PLDAPControlA*,PLDAPControlA*); +ULONG CDECL ldap_start_tls_sW(WLDAP32_PLDAP,PULONG,WLDAP32_LDAPMessage**,PLDAPControlW*,PLDAPControlW*); +ULONG CDECL ldap_startup(PLDAP_VERSION_INFO,HANDLE*); +BOOLEAN CDECL ldap_stop_tls_s(WLDAP32_PLDAP); +ULONG CDECL ldap_ufn2dnA(PCHAR,PCHAR*); +ULONG CDECL ldap_ufn2dnW(PWCHAR,PWCHAR*); +ULONG CDECL WLDAP32_ldap_unbind(WLDAP32_LDAP*); +ULONG CDECL WLDAP32_ldap_unbind_s(WLDAP32_LDAP*); +ULONG CDECL ldap_value_freeA(PCHAR*); +ULONG CDECL ldap_value_freeW(PWCHAR*); +ULONG CDECL WLDAP32_ldap_value_free_len(struct WLDAP32_berval**); + +ULONG CDECL LdapGetLastError(void); +ULONG CDECL LdapMapErrorToWin32(ULONG); +int CDECL LdapUnicodeToUTF8(LPCWSTR,int,LPSTR,int); +int CDECL LdapUTF8ToUnicode(LPCSTR,int,LPWSTR,int); Modified: trunk/reactos/dll/win32/wldap32/wldap32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32.… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/wldap32.h [iso-8859-1] Sun Jan 11 13:02:16 2009 @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +ULONG map_error( int ); + /* A set of helper functions to convert LDAP data structures * to and from ansi (A), wide character (W) and utf8 (U) encodings. */ Modified: trunk/reactos/dll/win32/wldap32/wldap32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32.… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/wldap32.rc [iso-8859-1] Sun Jan 11 13:02:16 2009 @@ -31,6 +31,7 @@ #include "wldap32_Nl.rc" #include "wldap32_No.rc" #include "wldap32_Pl.rc" +#include "wldap32_Pt.rc" #include "wldap32_Ru.rc" #include "wldap32_Sv.rc" #include "wldap32_Tr.rc" Modified: trunk/reactos/dll/win32/wldap32/wldap32_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/wldap32_Ko.rc [iso-8859-1] Sun Jan 11 13:02:16 2009 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { Added: trunk/reactos/dll/win32/wldap32/wldap32_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32_Pt.rc (added) +++ trunk/reactos/dll/win32/wldap32/wldap32_Pt.rc [iso-8859-1] Sun Jan 11 13:02:16 2009 @@ -1,0 +1,123 @@ +/* + * Portuguese resources for WLDAP32 + * + * Copyright 2008 Ricardo Filipe + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + 0 "Sucesso" + 1 "Erro de operações" + 2 "Erro de protocolo" + 3 "Tempo limite excedido" + 4 "Tamanho limite excedido" + 5 "Comparar Falso" + 6 "Comparar Verdadeiro" + 7 "Método de autenticação não suportado" + 8 "Autenticação forte necessária" + 9 "Referência (v2)" + 10 "Referência" + 11 "Limite de administração excedido" + 12 "Extensão Crítica indisponível" + 13 "Confidencialidade necessária" + 14 "" + 15 "" + 16 "Atributo não encontrado" + 17 "Tipo indefinido" + 18 "Atribuição imprópria" + 19 "Violação de restrições" + 20 "Valor ou atributo existente" + 21 "Sintaxe Inválida" + 22 "" + 23 "" + 24 "" + 25 "" + 26 "" + 27 "" + 28 "" + 29 "" + 30 "" + 31 "" + 32 "Objecto não encontrado" + 33 "Problema de abreviatura" + 34 "Sintaxe DN inválida" + 35 "É folha" + 36 "Problema na referência da abreviatura" + 37 "" + 38 "" + 39 "" + 40 "" + 41 "" + 42 "" + 43 "" + 44 "" + 45 "" + 46 "" + 47 "" + 48 "Autenticação imprópria" + 49 "Credenciais Inválidas" + 50 "Direitos insuficientes" + 51 "Ocupado" + 52 "Indisponível" + 53 "Indisposto a realizar" + 54 "Ciclo detectado" + 55 "" + 56 "" + 57 "" + 58 "" + 59 "" + 60 "Falta de controlo de ordenação" + 61 "Erro de limite de índice" + 62 "" + 63 "" + 64 "Violação de Nome" + 65 "Violação da Classe de Objecto" + 66 "Não permitido em não-folha" + 67 "Não permitido em RDN" + 68 "Já existe" + 69 "Sem modificações de Classe de Objecto" + 70 "Resultados muito grandes" + 71 "Afecta múltiplos DSAs" + 72 "" + 73 "" + 74 "" + 75 "" + 76 "" + 77 "" + 78 "" + 79 "" + 80 "Outro" + 81 "Servidor em baixo" + 82 "Erro Local" + 83 "Erro de Codificação" + 84 "Erro de Descodificação" + 85 "Tempo excedido" + 86 "Autenticação desconhecida" + 87 "Erro de filtro" + 88 "Cancelado pelo utilizador" + 89 "Erro de parâmetro" + 90 "Sem memória" + 91 "Não consegue ligar ao servidor LDAP" + 92 "Operação não suportada por esta versão do protocolo LDAP" + 93 "O controlo especificado não foi encontrado na mensagem" + 94 "Nenhum resultado presente na mensagem" + 95 "Mais resultados devolvidos" + 96 "Ciclo enquanto resolve referências" + 97 "Limite de salto de referências excedido" +} Propchange: trunk/reactos/dll/win32/wldap32/wldap32_Pt.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dchapyshev] 38705: - Sync cryptui with Wine head
by dchapyshev＠svn.reactos.org 11 Jan '09

11 Jan '09

Author: dchapyshev Date: Sun Jan 11 12:58:04 2009 New Revision: 38705 URL: http://svn.reactos.org/svn/reactos?rev=38705&view=rev Log: - Sync cryptui with Wine head Added: trunk/reactos/dll/win32/cryptui/certheader.bmp (with props) trunk/reactos/dll/win32/cryptui/certwatermark.bmp (with props) Modified: trunk/reactos/dll/win32/cryptui/cryptui.rbuild trunk/reactos/dll/win32/cryptui/cryptui.rc trunk/reactos/dll/win32/cryptui/cryptui.spec trunk/reactos/dll/win32/cryptui/cryptui_En.rc trunk/reactos/dll/win32/cryptui/cryptuires.h trunk/reactos/dll/win32/cryptui/main.c [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/win32/cryptui/certheader.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/certhead… Added: trunk/reactos/dll/win32/cryptui/certwatermark.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/certwate… Modified: trunk/reactos/dll/win32/cryptui/cryptui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… Modified: trunk/reactos/dll/win32/cryptui/cryptui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… Modified: trunk/reactos/dll/win32/cryptui/cryptui.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… Modified: trunk/reactos/dll/win32/cryptui/cryptui_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Modified: trunk/reactos/dll/win32/cryptui/cryptuires.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptuir… Modified: trunk/reactos/dll/win32/cryptui/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/main.c?r…

1 0

[dchapyshev] 38704: - Sync credui with Wine head
by dchapyshev＠svn.reactos.org 11 Jan '09

11 Jan '09

Author: dchapyshev Date: Sun Jan 11 12:56:19 2009 New Revision: 38704 URL: http://svn.reactos.org/svn/reactos?rev=38704&view=rev Log: - Sync credui with Wine head Added: trunk/reactos/dll/win32/credui/credui_Pt.rc (with props) Modified: trunk/reactos/dll/win32/credui/credui.rc trunk/reactos/dll/win32/credui/credui_Ko.rc trunk/reactos/dll/win32/credui/credui_Zh.rc Modified: trunk/reactos/dll/win32/credui/credui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui.rc… ============================================================================== --- trunk/reactos/dll/win32/credui/credui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui.rc [iso-8859-1] Sun Jan 11 12:56:19 2009 @@ -36,6 +36,7 @@ #include "credui_Nl.rc" #include "credui_No.rc" #include "credui_Pl.rc" +#include "credui_Pt.rc" #include "credui_Ru.rc" #include "credui_Si.rc" #include "credui_Sv.rc" Modified: trunk/reactos/dll/win32/credui/credui_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Ko… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Ko.rc [iso-8859-1] Sun Jan 11 12:56:19 2009 @@ -24,7 +24,7 @@ IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "IDS_TITLEFORMAT" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN CONTROL IDB_BANNER,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,0, 0,213,37 Added: trunk/reactos/dll/win32/credui/credui_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Pt… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Pt.rc (added) +++ trunk/reactos/dll/win32/credui/credui_Pt.rc [iso-8859-1] Sun Jan 11 12:56:19 2009 @@ -1,0 +1,50 @@ +/* + * Portuguese language resource file for Credentials UI + * + * Copyright 2008 Ricardo Filipe + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_BANNER,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "&User name:",IDC_STATIC,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "&Password:",IDC_STATIC,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "&Lembrar a password",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "OK",IDOK,97,128,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,156,128,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_TITLEFORMAT "Ligar a %s" + IDS_MESSAGEFORMAT "A ligar a %s" + IDS_INCORRECTPASSWORDTITLE "Logon mal sucedido" + IDS_INCORRECTPASSWORD "Verifique que o seu nome de utilizador\ne password estão correctos." + IDS_CAPSLOCKONTITLE "Caps Lock ligado" + IDS_CAPSLOCKON "Tendo o Caps Lock ligado pode provocar que introduza a sua password incorrectamente.\n\nPressione a tecla Caps Lock no seu teclado para desligar o Caps Lock antes\nde introduzir a password." +} Propchange: trunk/reactos/dll/win32/credui/credui_Pt.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/credui/credui_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Zh… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_Zh.rc [iso-8859-1] Sun Jan 11 12:56:19 2009 @@ -26,7 +26,7 @@ IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "IDS_TITLEFORMAT" -FONT 9, "MS Song" +FONT 9, "MS Shell Dlg" BEGIN CONTROL IDB_BANNER,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,0, 0,213,37 @@ -57,7 +57,7 @@ IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "IDS_TITLEFORMAT" -FONT 8, "PMingLiu" +FONT 9, "MS Shell Dlg" BEGIN CONTROL IDB_BANNER,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,0, 0,213,37

1 0

[dchapyshev] 38703: - Sync headers with Wine
by dchapyshev＠svn.reactos.org 11 Jan '09

11 Jan '09

Author: dchapyshev Date: Sun Jan 11 12:55:29 2009 New Revision: 38703 URL: http://svn.reactos.org/svn/reactos?rev=38703&view=rev Log: - Sync headers with Wine Modified: trunk/reactos/include/psdk/clusapi.h trunk/reactos/include/psdk/wincrypt.h Modified: trunk/reactos/include/psdk/clusapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/clusapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/clusapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/clusapi.h [iso-8859-1] Sun Jan 11 12:55:29 2009 @@ -1,19 +1,40 @@ +/* + * Copyright 2006 James Hawkins + * + * 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 _CLUSAPI_H -#define _CLUSAPI_H +#ifndef __WINE_CLUSAPI_H +#define __WINE_CLUSAPI_H #ifdef __cplusplus extern "C" { #endif -DWORD -WINAPI -GetNodeClusterState( - IN LPCWSTR lpszNodeName, - OUT DWORD *pdwClusterState - ); +typedef struct _HCLUSTER *HCLUSTER; +typedef struct _HCLUSENUM *HCLUSENUM; + +BOOL WINAPI CloseCluster(HCLUSTER hCluster); +DWORD WINAPI GetNodeClusterState(LPCWSTR lpszNodeName, LPDWORD pdwClusterState); +HCLUSTER WINAPI OpenCluster(LPCWSTR lpszClusterName); +HCLUSENUM WINAPI ClusterOpenEnum(HCLUSTER hCluster, DWORD dwType); +DWORD WINAPI ClusterEnum(HCLUSENUM hEnum, DWORD dwIndex, LPDWORD lpdwType, LPWSTR lpszName, LPDWORD lpcchName); +DWORD WINAPI ClusterCloseEnum(HCLUSENUM hEnum); #ifdef __cplusplus } #endif -#endif // _CLUSAPI_H + +#endif /* __WINE_CLUSAPI_H */ Modified: trunk/reactos/include/psdk/wincrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincrypt.h?re… ============================================================================== --- trunk/reactos/include/psdk/wincrypt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincrypt.h [iso-8859-1] Sun Jan 11 12:55:29 2009 @@ -290,10 +290,10 @@ #define CERT_NON_REPUDIATION_KEY_USAGE 0x40 #define CERT_KEY_ENCIPHERMENT_KEY_USAGE 0x20 #define CERT_DATA_ENCIPHERMENT_KEY_USAGE 0x10 -#define CERT_KEY_AGREEMENT_KEY_USAGE 0x80 -#define CERT_KEY_CERT_SIGN_KEY_USAGE 0x40 -#define CERT_OFFLINE_CRL_SIGN_KEY_USAGE 0x20 -#define CERT_CRL_SIGN_KEY_USAGE 0x10 +#define CERT_KEY_AGREEMENT_KEY_USAGE 0x08 +#define CERT_KEY_CERT_SIGN_KEY_USAGE 0x04 +#define CERT_OFFLINE_CRL_SIGN_KEY_USAGE 0x02 +#define CERT_CRL_SIGN_KEY_USAGE 0x02 #define CERT_ENCIPHER_ONLY_KEY_USAGE 0x01 /* byte 1 */ #define CERT_DECIPHER_ONLY_KEY_USAGE 0x80 @@ -860,10 +860,10 @@ #define CERT_TRUST_IS_OFFLINE_REVOCATION 0x01000000 #define CERT_TRUST_NO_ISSUANCE_CHAIN_POLICY 0x02000000 -#define CERT_TRUST_IS_PARTIAL_CHAIN 0x00001000 -#define CERT_TRUST_CTL_IS_NOT_TIME_VALID 0x00002000 -#define CERT_TRUST_CTL_IS_NOT_SIGNATURE_VALID 0x00004000 -#define CERT_TRUST_CTL_IS_NOT_VALID_FOR_USAGE 0x00008000 +#define CERT_TRUST_IS_PARTIAL_CHAIN 0x00010000 +#define CERT_TRUST_CTL_IS_NOT_TIME_VALID 0x00020000 +#define CERT_TRUST_CTL_IS_NOT_SIGNATURE_VALID 0x00040000 +#define CERT_TRUST_CTL_IS_NOT_VALID_FOR_USAGE 0x00080000 #define CERT_TRUST_HAS_EXACT_MATCH_ISSUER 0x00000001 #define CERT_TRUST_HAS_KEY_MATCH_ISSUER 0x00000002 @@ -1082,7 +1082,7 @@ void *pvReserved, void *pvArg); /* Encode/decode object */ -typedef LPVOID (WINAPI *PFN_CRYPT_ALLOC)(size_t cbsize); +typedef LPVOID (__WINE_ALLOC_SIZE(1) WINAPI *PFN_CRYPT_ALLOC)(size_t cbsize); typedef VOID (WINAPI *PFN_CRYPT_FREE)(LPVOID pv); typedef struct _CRYPT_ENCODE_PARA { @@ -3087,6 +3087,8 @@ #define szOID_NETSCAPE_CA_POLICY_URL "2.16.840.1.113730.1.8" #define szOID_NETSCAPE_SSL_SERVER_NAME "2.16.840.1.113730.1.12" #define szOID_NETSCAPE_COMMENT "2.16.840.1.113730.1.13" +#define szOID_NETSCAPE_DATA_TYPE "2.16.840.1.113730.2" +#define szOID_NETSCAPE_CERT_SEQUENCE "2.16.840.1.113730.2.5" /* Bits for szOID_NETSCAPE_CERT_TYPE */ #define NETSCAPE_SSL_CLIENT_AUTH_CERT_TYPE 0x80 @@ -3797,7 +3799,7 @@ WINADVAPI BOOL WINAPI CryptHashData (HCRYPTHASH, CONST BYTE *, DWORD, DWORD); WINADVAPI BOOL WINAPI CryptHashSessionKey (HCRYPTHASH, HCRYPTKEY, DWORD); WINADVAPI BOOL WINAPI CryptImportKey (HCRYPTPROV, CONST BYTE *, DWORD, HCRYPTKEY, DWORD, HCRYPTKEY *); -WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, DWORD); +WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, ULONG_PTR); WINADVAPI BOOL WINAPI CryptSetHashParam (HCRYPTHASH, DWORD, CONST BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetKeyParam (HCRYPTKEY, DWORD, CONST BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetProviderA (LPCSTR, DWORD); @@ -3815,8 +3817,8 @@ #define CryptVerifySignature WINELIB_NAME_AW(CryptVerifySignature) /* crypt32.dll functions */ -LPVOID WINAPI CryptMemAlloc(ULONG cbSize); -LPVOID WINAPI CryptMemRealloc(LPVOID pv, ULONG cbSize); +LPVOID WINAPI CryptMemAlloc(ULONG cbSize) __WINE_ALLOC_SIZE(1); +LPVOID WINAPI CryptMemRealloc(LPVOID pv, ULONG cbSize) __WINE_ALLOC_SIZE(2); VOID WINAPI CryptMemFree(LPVOID pv); BOOL WINAPI CryptBinaryToStringA(const BYTE *pbBinary, @@ -3880,6 +3882,8 @@ BOOL WINAPI CryptRegisterOIDInfo(PCCRYPT_OID_INFO pInfo, DWORD dwFlags); BOOL WINAPI CryptUnregisterOIDInfo(PCCRYPT_OID_INFO pInfo); +LPCWSTR WINAPI CryptFindLocalizedName(LPCWSTR pwszCryptName); + LPCSTR WINAPI CertAlgIdToOID(DWORD dwAlgId); DWORD WINAPI CertOIDToAlgId(LPCSTR pszObjId); @@ -4046,7 +4050,7 @@ DWORD WINAPI CertGetPublicKeyLength(DWORD dwCertEncodingType, PCERT_PUBLIC_KEY_INFO pPublicKey); -const void *CertCreateContext(DWORD dwContextType, DWORD dwEncodingType, +const void * WINAPI CertCreateContext(DWORD dwContextType, DWORD dwEncodingType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCERT_CREATE_CONTEXT_PARA pCreatePara);

1 0

[dchapyshev] 38702: - Sync clusapi with Wine head
by dchapyshev＠svn.reactos.org 11 Jan '09

11 Jan '09

Author: dchapyshev Date: Sun Jan 11 12:54:21 2009 New Revision: 38702 URL: http://svn.reactos.org/svn/reactos?rev=38702&view=rev Log: - Sync clusapi with Wine head Modified: trunk/reactos/dll/win32/clusapi/clusapi.c trunk/reactos/dll/win32/clusapi/clusapi.spec Modified: trunk/reactos/dll/win32/clusapi/clusapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/clusapi/clusapi.… ============================================================================== --- trunk/reactos/dll/win32/clusapi/clusapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/clusapi/clusapi.c [iso-8859-1] Sun Jan 11 12:54:21 2009 @@ -47,6 +47,60 @@ return ERROR_SUCCESS; } +/*********************************************************************** + * OpenCluster (CLUSAPI.@) + * + */ +HCLUSTER WINAPI OpenCluster(LPCWSTR lpszClusterName) +{ + FIXME("(%s) stub!\n", debugstr_w(lpszClusterName)); + + return (HCLUSTER)0xdeadbeef; +} + +/*********************************************************************** + * CloseCluster (CLUSAPI.@) + * + */ +BOOL WINAPI CloseCluster(HCLUSTER hCluster) +{ + FIXME("(%p) stub!\n", hCluster); + + return TRUE; +} + +/*********************************************************************** + * ClusterOpenEnum (CLUSAPI.@) + * + */ +HCLUSENUM WINAPI ClusterOpenEnum(HCLUSTER hCluster, DWORD dwType) +{ + FIXME("(%p, %u) stub!\n", hCluster,dwType); + + return (HCLUSENUM)0xdeadbeef; +} + +/*********************************************************************** + * ClusterCloseEnum (CLUSAPI.@) + * + */ +DWORD WINAPI ClusterCloseEnum(HCLUSENUM hEnum) +{ + FIXME("(%p) stub!\n", hEnum); + + return ERROR_SUCCESS; +} + +/*********************************************************************** + * ClusterEnum (CLUSAPI.@) + * + */ +DWORD WINAPI ClusterEnum(HCLUSENUM hEnum, DWORD dwIndex, LPDWORD lpdwType, LPWSTR lpszName, LPDWORD lpcchName) +{ + FIXME("(%p, %u, %u, %s, %u) stub!\n", hEnum, dwIndex, *lpdwType, debugstr_w(lpszName), *lpcchName); + + return ERROR_NO_MORE_ITEMS; +} /*********************************************************************** * DllMain (CLUSAPI.@) Modified: trunk/reactos/dll/win32/clusapi/clusapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/clusapi/clusapi.… ============================================================================== --- trunk/reactos/dll/win32/clusapi/clusapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/clusapi/clusapi.spec [iso-8859-1] Sun Jan 11 12:54:21 2009 @@ -3,16 +3,16 @@ @ stub BackupClusterDatabase @ stub CanResourceBeDependent @ stub ChangeClusterResourceGroup -@ stub CloseCluster +@ stdcall CloseCluster(ptr) @ stub CloseClusterGroup @ stub CloseClusterNetInterface @ stub CloseClusterNetwork @ stub CloseClusterNode @ stub CloseClusterNotifyPort @ stub CloseClusterResource -@ stub ClusterCloseEnum +@ stdcall ClusterCloseEnum(ptr) @ stub ClusterControl -@ stub ClusterEnum +@ stdcall ClusterEnum(ptr long ptr wstr ptr) @ stub ClusterGetEnumCount @ stub ClusterGroupCloseEnum @ stub ClusterGroupControl @@ -30,7 +30,7 @@ @ stub ClusterNodeEnum @ stub ClusterNodeGetEnumCount @ stub ClusterNodeOpenEnum -@ stub ClusterOpenEnum +@ stdcall ClusterOpenEnum(ptr long) @ stub ClusterRegCloseKey @ stub ClusterRegCreateKey @ stub ClusterRegDeleteKey @@ -93,7 +93,7 @@ @ stub OfflineClusterResource @ stub OnlineClusterGroup @ stub OnlineClusterResource -@ stub OpenCluster +@ stdcall OpenCluster(wstr) @ stub OpenClusterGroup @ stub OpenClusterNetInterface @ stub OpenClusterNetwork

1 0

[dchapyshev] 38701: - Sync netapi32 with Wine head
by dchapyshev＠svn.reactos.org 11 Jan '09

11 Jan '09

Author: dchapyshev Date: Sun Jan 11 09:59:49 2009 New Revision: 38701 URL: http://svn.reactos.org/svn/reactos?rev=38701&view=rev Log: - Sync netapi32 with Wine head Modified: trunk/reactos/dll/win32/netapi32/access.c trunk/reactos/dll/win32/netapi32/nbt.c trunk/reactos/dll/win32/netapi32/netapi32.spec trunk/reactos/dll/win32/netapi32/netbios.c trunk/reactos/dll/win32/netapi32/share.c trunk/reactos/dll/win32/netapi32/wksta.c Modified: trunk/reactos/dll/win32/netapi32/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/access.… ============================================================================== --- trunk/reactos/dll/win32/netapi32/access.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/access.c [iso-8859-1] Sun Jan 11 09:59:49 2009 @@ -417,6 +417,10 @@ LPDWORD entriesread, LPDWORD totalentries) { NET_API_STATUS status; + const WCHAR admins[] = {'A','d','m','i','n','i','s','t','r','a','t','o','r','s',0}; + LPWSTR currentuser; + LOCALGROUP_USERS_INFO_0* info; + DWORD size; FIXME("(%s, %s, %d, %08x, %p %d, %p, %p) stub!\n", debugstr_w(servername), debugstr_w(username), level, flags, bufptr, @@ -426,12 +430,37 @@ if (status != NERR_Success) return status; - if (!NETAPI_FindUser(username)) + size = UNLEN + 1; + NetApiBufferAllocate(size, (LPVOID*)&currentuser); + GetUserNameW(currentuser, &size); + + if (lstrcmpiW(username, currentuser) && NETAPI_FindUser(username)) + { + NetApiBufferFree(currentuser); return NERR_UserNotFound; - - if (bufptr) *bufptr = NULL; - if (entriesread) *entriesread = 0; - if (totalentries) *totalentries = 0; + } + + NetApiBufferFree(currentuser); + *totalentries = 1; + size = sizeof(*info) + sizeof(admins); + + if(prefmaxlen < size) + status = ERROR_MORE_DATA; + else + status = NetApiBufferAllocate(size, (LPVOID*)&info); + + if(status != NERR_Success) + { + *bufptr = NULL; + *entriesread = 0; + return status; + } + + info->lgrui0_name = (LPWSTR)((LPBYTE)info + sizeof(*info)); + lstrcpyW(info->lgrui0_name, admins); + + *bufptr = (LPBYTE)info; + *entriesread = 1; return NERR_Success; } @@ -485,7 +514,7 @@ usr->usri1_comment[0] = 0; usr->usri1_flags = UF_SCRIPT | UF_NORMAL_ACCOUNT | UF_DONT_EXPIRE_PASSWD; usr->usri1_full_name[0] = 0; - usr->usri1_user_id = 500; + usr->usri1_user_id = DOMAIN_USER_RID_ADMIN; usr->usri1_next_index = 0; } @@ -525,7 +554,7 @@ usr->usri1_flags = UF_ACCOUNTDISABLE | UF_SCRIPT | UF_NORMAL_ACCOUNT | UF_DONT_EXPIRE_PASSWD; usr->usri1_full_name[0] = 0; - usr->usri1_user_id = 500; + usr->usri1_user_id = DOMAIN_USER_RID_GUEST; usr->usri1_next_index = 0; } @@ -689,6 +718,18 @@ return NERR_DCNotFound; /* say we can't find a domain controller */ } +/************************************************************ + * NetGroupEnum (NETAPI32.@) + * + */ +NET_API_STATUS WINAPI +NetGroupEnum(LPCWSTR servername, DWORD level, LPBYTE *bufptr, DWORD prefmaxlen, + LPDWORD entriesread, LPDWORD totalentries, LPDWORD resume_handle) +{ + FIXME("(%s, %d, %p, %d, %p, %p, %p) stub!\n", debugstr_w(servername), + level, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); + return ERROR_ACCESS_DENIED; +} /****************************************************************************** * NetUserModalsGet (NETAPI32.@) Modified: trunk/reactos/dll/win32/netapi32/nbt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/nbt.c?r… ============================================================================== --- trunk/reactos/dll/win32/netapi32/nbt.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/nbt.c [iso-8859-1] Sun Jan 11 09:59:49 2009 @@ -415,10 +415,7 @@ if (queryData->cacheEntry) queryData->cacheEntry->numAddresses = 0; else - { - ret = FALSE; queryData->ret = NRC_OSRESNOTAV; - } } if (rLen == 6 && queryData->cacheEntry && queryData->cacheEntry->numAddresses < answerCount) @@ -850,8 +847,8 @@ astat->max_sess_pkt_size = 0xffff; astat->xmit_success = adapter->xmit_success; astat->recv_success = adapter->recv_success; - } - ret = NRC_GOODRET; + ret = NRC_GOODRET; + } } else ret = NetBTAstatRemote(adapter, ncb); @@ -1183,6 +1180,7 @@ * message header. */ NetBIOSHangupSession(ncb); ret = NRC_SABORT; + goto error; } else if (buffer[0] != NBSS_MSG) { @@ -1190,6 +1188,7 @@ FIXME("Received unexpected session msg type %d\n", buffer[0]); NetBIOSHangupSession(ncb); ret = NRC_SABORT; + goto error; } else { @@ -1199,6 +1198,7 @@ FIXME("Received a message that's too long for my taste\n"); NetBIOSHangupSession(ncb); ret = NRC_SABORT; + goto error; } else { @@ -1226,6 +1226,7 @@ adapter->recv_success++; } } +error: TRACE("returning 0x%02x\n", ret); return ret; } Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] Sun Jan 11 09:59:49 2009 @@ -98,7 +98,7 @@ @ stub NetGroupAddUser @ stub NetGroupDel @ stub NetGroupDelUser -@ stub NetGroupEnum +@ stdcall NetGroupEnum(wstr long ptr long ptr ptr ptr) @ stub NetGroupGetInfo @ stub NetGroupGetUsers @ stub NetGroupSetInfo @@ -188,13 +188,13 @@ @ stub NetSessionDel @ stdcall NetSessionEnum(wstr wstr wstr long ptr long ptr ptr ptr) @ stub NetSessionGetInfo -@ stub NetShareAdd +@ stdcall NetShareAdd(wstr long ptr ptr) @ stub NetShareCheck @ stdcall NetShareDel(wstr wstr long) @ stub NetShareDelSticky @ stdcall NetShareEnum(wstr long ptr long ptr ptr ptr) @ stub NetShareEnumSticky -@ stub NetShareGetInfo +@ stdcall NetShareGetInfo(wstr wstr long ptr) @ stub NetShareSetInfo @ stdcall NetStatisticsGet(wstr wstr long long ptr) @ stdcall NetUseAdd(wstr long ptr ptr) @@ -217,7 +217,7 @@ @ stub NetWkstaTransportAdd @ stub NetWkstaTransportDel @ stdcall NetWkstaTransportEnum (wstr long ptr long ptr ptr ptr) -@ stub NetWkstaUserEnum +@ stdcall NetWkstaUserEnum(wstr long ptr long ptr ptr ptr) @ stdcall NetWkstaUserGetInfo(wstr long ptr) @ stub NetWkstaUserSetInfo @ stdcall NetapipBufferAllocate(long ptr) NetApiBufferAllocate Modified: trunk/reactos/dll/win32/netapi32/netbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netbios… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netbios.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netbios.c [iso-8859-1] Sun Jan 11 09:59:49 2009 @@ -637,7 +637,7 @@ EnterCriticalSection(&adapter->cs); memset(session, 0, sizeof(NetBIOSSession)); LeaveCriticalSection(&adapter->cs); - return NRC_GOODRET; + return ret; } static UCHAR nbHangup(NetBIOSAdapter *adapter, const NCB *ncb) Modified: trunk/reactos/dll/win32/netapi32/share.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/share.c… ============================================================================== --- trunk/reactos/dll/win32/netapi32/share.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/share.c [iso-8859-1] Sun Jan 11 09:59:49 2009 @@ -92,3 +92,24 @@ FIXME("Stub (%s %s %d)\n", debugstr_w(servername), debugstr_w(netname), reserved); return NERR_Success; } + +/************************************************************ + * NetShareGetInfo (NETAPI32.@) + */ +NET_API_STATUS WINAPI NetShareGetInfo(LMSTR servername, LMSTR netname, + DWORD level, LPBYTE *bufptr) +{ + FIXME("Stub (%s %s %d %p)\n", debugstr_w(servername), + debugstr_w(netname),level, bufptr); + return NERR_NetNameNotFound; +} + +/************************************************************ + * NetShareAdd (NETAPI32.@) + */ +NET_API_STATUS WINAPI NetShareAdd(LMSTR servername, + DWORD level, LPBYTE buf, LPDWORD parm_err) +{ + FIXME("Stub (%s %d %p %p)\n", debugstr_w(servername), level, buf, parm_err); + return ERROR_NOT_SUPPORTED; +} Modified: trunk/reactos/dll/win32/netapi32/wksta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/wksta.c… ============================================================================== --- trunk/reactos/dll/win32/netapi32/wksta.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/wksta.c [iso-8859-1] Sun Jan 11 09:59:49 2009 @@ -98,7 +98,7 @@ else buffer[2*i+1] = (WCHAR)((val & 0xf) + '0'); } - buffer[2*i]=(WCHAR)0; + buffer[2*i]=0; } /* Theoretically this could be too short, except that MS defines @@ -444,6 +444,19 @@ } /************************************************************ + * NetWkstaUserEnum (NETAPI32.@) + */ +NET_API_STATUS WINAPI +NetWkstaUserEnum(LMSTR servername, DWORD level, LPBYTE* bufptr, + DWORD prefmaxlen, LPDWORD entriesread, + LPDWORD totalentries, LPDWORD resumehandle) +{ + FIXME("(%s, %d, %p, %d, %p, %p, %p): stub!\n", debugstr_w(servername), + level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle); + return ERROR_INVALID_PARAMETER; +} + +/************************************************************ * NetpGetComputerName (NETAPI32.@) */ NET_API_STATUS WINAPI NetpGetComputerName(LPWSTR *Buffer)

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
76
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 January 2009