Ros-diffs November 2015

ros-diffs@reactos.org

14 participants
457 discussions

[spetreolle] 69944: [IPHLPAPI] GetAdapters: Don't stop looking for the dns servers if an interface hasn't an entry. This is not an error condtion, the loopback doesn't have one.
by spetreolle＠svn.reactos.org 19 Nov '15

19 Nov '15

Author: spetreolle Date: Thu Nov 19 21:43:55 2015 New Revision: 69944 URL: http://svn.reactos.org/svn/reactos?rev=69944&view=rev Log: [IPHLPAPI] GetAdapters: Don't stop looking for the dns servers if an interface hasn't an entry. This is not an error condtion, the loopback doesn't have one. Modified: trunk/reactos/dll/win32/iphlpapi/address.c Modified: trunk/reactos/dll/win32/iphlpapi/address.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/address… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/address.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/address.c [iso-8859-1] Thu Nov 19 21:43:55 2015 @@ -397,12 +397,7 @@ "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\%*s", Entry->if_descrlen, &Entry->if_descr[0]); - if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, KeyName, 0, KEY_READ, &InterfaceKey) != ERROR_SUCCESS) - { - ERR("Failed opening interface key for interface %*s\n", Entry->if_descrlen, &Entry->if_descr[0]); - Flags |= GAA_FLAG_SKIP_DNS_SERVER; - } - else + if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, KeyName, 0, KEY_READ, &InterfaceKey) == ERROR_SUCCESS) { EnumNameServers(InterfaceKey, NULL, &CurrentAASize, EnumerateServerNameSize); RegCloseKey(InterfaceKey); @@ -471,7 +466,7 @@ if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, KeyName, 0, KEY_READ, &InterfaceKey) != ERROR_SUCCESS) { - ERR("Failed opening interface key for interface %*s\n", Entry->if_descrlen, &Entry->if_descr[0]); + TRACE("Failed opening interface key for interface %*s\n", Entry->if_descrlen, &Entry->if_descr[0]); } else { @@ -567,7 +562,7 @@ } } - ERR("address is 0x%08x, mask is 0x%08x\n", AddrEntries[j].iae_addr, AddrEntries[j].iae_mask); + TRACE("address is 0x%08x, mask is 0x%08x\n", AddrEntries[j].iae_addr, AddrEntries[j].iae_mask); //FIXME: For now reactos only supports unicast addresses if (!(Flags & GAA_FLAG_SKIP_UNICAST))

1 0

[rnaumann] 69943: [BROWSEUI] Handle Alt+Up. Patch by Jared Smudde CORE-10528 This commit is dedicated to Samuel Serapion!
by rnaumann＠svn.reactos.org 19 Nov '15

19 Nov '15

Author: rnaumann Date: Thu Nov 19 19:37:15 2015 New Revision: 69943 URL: http://svn.reactos.org/svn/reactos?rev=69943&view=rev Log: [BROWSEUI] Handle Alt+Up. Patch by Jared Smudde CORE-10528 This commit is dedicated to Samuel Serapion! Modified: trunk/reactos/dll/win32/browseui/lang/bg-BG.rc trunk/reactos/dll/win32/browseui/lang/de-DE.rc trunk/reactos/dll/win32/browseui/lang/en-US.rc trunk/reactos/dll/win32/browseui/lang/es-ES.rc trunk/reactos/dll/win32/browseui/lang/he-IL.rc trunk/reactos/dll/win32/browseui/lang/it-IT.rc trunk/reactos/dll/win32/browseui/lang/pl-PL.rc trunk/reactos/dll/win32/browseui/lang/ro-RO.rc trunk/reactos/dll/win32/browseui/lang/ru-RU.rc trunk/reactos/dll/win32/browseui/lang/sq-AL.rc trunk/reactos/dll/win32/browseui/lang/tr-TR.rc trunk/reactos/dll/win32/browseui/lang/uk-UA.rc trunk/reactos/dll/win32/browseui/lang/zh-CN.rc Modified: trunk/reactos/dll/win32/browseui/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/bg… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/bg-BG.rc [iso-8859-1] Thu Nov 19 19:37:15 2015 @@ -125,6 +125,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_UP, IDM_GOTO_UPONELEVEL, VIRTKEY, ALT VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT Modified: trunk/reactos/dll/win32/browseui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/de… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/de-DE.rc [iso-8859-1] Thu Nov 19 19:37:15 2015 @@ -143,6 +143,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_UP, IDM_GOTO_UPONELEVEL, VIRTKEY, ALT VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT Modified: trunk/reactos/dll/win32/browseui/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/en… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/en-US.rc [iso-8859-1] Thu Nov 19 19:37:15 2015 @@ -143,6 +143,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_UP, IDM_GOTO_UPONELEVEL, VIRTKEY, ALT VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT Modified: trunk/reactos/dll/win32/browseui/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/es… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/es-ES.rc [iso-8859-1] Thu Nov 19 19:37:15 2015 @@ -126,6 +126,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_UP, IDM_GOTO_UPONELEVEL, VIRTKEY, ALT VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "Q", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT Modified: trunk/reactos/dll/win32/browseui/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/he… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/he-IL.rc [iso-8859-1] Thu Nov 19 19:37:15 2015 @@ -127,6 +127,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_UP, IDM_GOTO_UPONELEVEL, VIRTKEY, ALT VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT Modified: trunk/reactos/dll/win32/browseui/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/it… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/it-IT.rc [iso-8859-1] Thu Nov 19 19:37:15 2015 @@ -125,6 +125,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_UP, IDM_GOTO_UPONELEVEL, VIRTKEY, ALT VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT Modified: trunk/reactos/dll/win32/browseui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/pl-PL.rc [iso-8859-1] Thu Nov 19 19:37:15 2015 @@ -133,6 +133,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_UP, IDM_GOTO_UPONELEVEL, VIRTKEY, ALT VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT Modified: trunk/reactos/dll/win32/browseui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ro… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/ro-RO.rc [iso-8859-1] Thu Nov 19 19:37:15 2015 @@ -127,6 +127,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_UP, IDM_GOTO_UPONELEVEL, VIRTKEY, ALT VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT Modified: trunk/reactos/dll/win32/browseui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] Thu Nov 19 19:37:15 2015 @@ -127,6 +127,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_UP, IDM_GOTO_UPONELEVEL, VIRTKEY, ALT VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT Modified: trunk/reactos/dll/win32/browseui/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/sq… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/sq-AL.rc [iso-8859-1] Thu Nov 19 19:37:15 2015 @@ -144,6 +144,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_UP, IDM_GOTO_UPONELEVEL, VIRTKEY, ALT VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT Modified: trunk/reactos/dll/win32/browseui/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/tr… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/tr-TR.rc [iso-8859-1] Thu Nov 19 19:37:15 2015 @@ -125,6 +125,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_UP, IDM_GOTO_UPONELEVEL, VIRTKEY, ALT VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT Modified: trunk/reactos/dll/win32/browseui/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/uk-UA.rc [iso-8859-1] Thu Nov 19 19:37:15 2015 @@ -127,6 +127,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_UP, IDM_GOTO_UPONELEVEL, VIRTKEY, ALT VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT Modified: trunk/reactos/dll/win32/browseui/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/zh-CN.rc [iso-8859-1] Thu Nov 19 19:37:15 2015 @@ -145,6 +145,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_UP, IDM_GOTO_UPONELEVEL, VIRTKEY, ALT VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT

1 0

[akhaldi] 69942: [EXPLORER] Fix MSVC build.
by akhaldi＠svn.reactos.org 19 Nov '15

19 Nov '15

Author: akhaldi Date: Thu Nov 19 16:46:51 2015 New Revision: 69942 URL: http://svn.reactos.org/svn/reactos?rev=69942&view=rev Log: [EXPLORER] Fix MSVC build. Modified: trunk/reactos/base/shell/explorer/resource.h Modified: trunk/reactos/base/shell/explorer/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/resour… ============================================================================== --- trunk/reactos/base/shell/explorer/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/resource.h [iso-8859-1] Thu Nov 19 16:46:51 2015 @@ -189,4 +189,4 @@ #define ID_SHELL_CMD_TILE_WND_H (ID_SHELL_CMD_LAST + 9) #define ID_SHELL_CMD_CASCADE_WND (ID_SHELL_CMD_LAST + 10) #define ID_SHELL_CMD_CUST_NOTIF (ID_SHELL_CMD_LAST + 11) -#define ID_SHELL_CMD_ADJUST_DAT (ID_SHELL_CMD_LAST + 12) +#define ID_SHELL_CMD_ADJUST_DAT (ID_SHELL_CMD_LAST + 12)

1 0

[ekohl] 69941: [FASTFAT] Fail, if we try to overwrite an existing directory.
by ekohl＠svn.reactos.org 19 Nov '15

19 Nov '15

Author: ekohl Date: Thu Nov 19 16:36:39 2015 New Revision: 69941 URL: http://svn.reactos.org/svn/reactos?rev=69941&view=rev Log: [FASTFAT] Fail, if we try to overwrite an existing directory. Modified: trunk/reactos/drivers/filesystems/fastfat/create.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Thu Nov 19 16:36:39 2015 @@ -353,6 +353,7 @@ PUNICODE_STRING PathNameU, PFILE_OBJECT FileObject, ULONG RequestedDisposition, + ULONG RequestedOptions, PVFATFCB *ParentFcb) { PVFATFCB Fcb; @@ -401,6 +402,16 @@ { DPRINT ("Could not make a new FCB, status: %x\n", Status); return Status; + } + + /* Fail, if we try to overwrite an existing directory */ + if ((!(RequestedOptions & FILE_DIRECTORY_FILE) && (*Fcb->Attributes & FILE_ATTRIBUTE_DIRECTORY)) && + (RequestedDisposition == FILE_OVERWRITE || + RequestedDisposition == FILE_OVERWRITE_IF || + RequestedDisposition == FILE_SUPERSEDE)) + { + vfatReleaseFCB(DeviceExt, Fcb); + return STATUS_OBJECT_NAME_COLLISION; } if (Fcb->Flags & FCB_DELETE_PENDING) @@ -580,8 +591,9 @@ /* Try opening the file. */ if (!OpenTargetDir) { - Status = VfatOpenFile(DeviceExt, &PathNameU, FileObject, RequestedDisposition, &ParentFcb); - if (Status == STATUS_ACCESS_DENIED) + Status = VfatOpenFile(DeviceExt, &PathNameU, FileObject, RequestedDisposition, RequestedOptions, &ParentFcb); + if (Status == STATUS_ACCESS_DENIED || + Status == STATUS_OBJECT_NAME_COLLISION) return Status; } else

1 0

[rnaumann] 69940: [EXPLORER] -Add the remaining Dialog Resources, needed for further implementation of taskbar and startmenu settings -Update some resource IDs to match with Win2k3 -Comment and reo...
by rnaumann＠svn.reactos.org 19 Nov '15

19 Nov '15

Author: rnaumann Date: Thu Nov 19 16:30:43 2015 New Revision: 69940 URL: http://svn.reactos.org/svn/reactos?rev=69940&view=rev Log: [EXPLORER] -Add the remaining Dialog Resources, needed for further implementation of taskbar and startmenu settings -Update some resource IDs to match with Win2k3 -Comment and reorder the resources for better overview Part 3/3 CORE-10030 Modified: trunk/reactos/base/shell/explorer/lang/bg-BG.rc trunk/reactos/base/shell/explorer/lang/cs-CZ.rc trunk/reactos/base/shell/explorer/lang/de-DE.rc trunk/reactos/base/shell/explorer/lang/en-US.rc trunk/reactos/base/shell/explorer/lang/es-ES.rc trunk/reactos/base/shell/explorer/lang/fr-FR.rc trunk/reactos/base/shell/explorer/lang/he-IL.rc trunk/reactos/base/shell/explorer/lang/it-IT.rc trunk/reactos/base/shell/explorer/lang/ja-JP.rc trunk/reactos/base/shell/explorer/lang/ko-KR.rc trunk/reactos/base/shell/explorer/lang/lt-LT.rc trunk/reactos/base/shell/explorer/lang/ms-MY.rc trunk/reactos/base/shell/explorer/lang/nl-NL.rc trunk/reactos/base/shell/explorer/lang/no-NO.rc trunk/reactos/base/shell/explorer/lang/pl-PL.rc trunk/reactos/base/shell/explorer/lang/pt-BR.rc trunk/reactos/base/shell/explorer/lang/ro-RO.rc trunk/reactos/base/shell/explorer/lang/ru-RU.rc trunk/reactos/base/shell/explorer/lang/sk-SK.rc trunk/reactos/base/shell/explorer/lang/sq-AL.rc trunk/reactos/base/shell/explorer/lang/tr-TR.rc trunk/reactos/base/shell/explorer/lang/uk-UA.rc trunk/reactos/base/shell/explorer/lang/zh-CN.rc trunk/reactos/base/shell/explorer/lang/zh-TW.rc trunk/reactos/base/shell/explorer/resource.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/shell/explorer/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/b… Modified: trunk/reactos/base/shell/explorer/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/c… Modified: trunk/reactos/base/shell/explorer/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/d… Modified: trunk/reactos/base/shell/explorer/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/e… Modified: trunk/reactos/base/shell/explorer/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/e… Modified: trunk/reactos/base/shell/explorer/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/f… Modified: trunk/reactos/base/shell/explorer/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/h… Modified: trunk/reactos/base/shell/explorer/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/i… Modified: trunk/reactos/base/shell/explorer/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/j… Modified: trunk/reactos/base/shell/explorer/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/k… Modified: trunk/reactos/base/shell/explorer/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/l… Modified: trunk/reactos/base/shell/explorer/lang/ms-MY.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/m… Modified: trunk/reactos/base/shell/explorer/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/n… Modified: trunk/reactos/base/shell/explorer/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/n… Modified: trunk/reactos/base/shell/explorer/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/p… Modified: trunk/reactos/base/shell/explorer/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/p… Modified: trunk/reactos/base/shell/explorer/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/r… Modified: trunk/reactos/base/shell/explorer/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/r… Modified: trunk/reactos/base/shell/explorer/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/s… Modified: trunk/reactos/base/shell/explorer/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/s… Modified: trunk/reactos/base/shell/explorer/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/t… Modified: trunk/reactos/base/shell/explorer/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/u… Modified: trunk/reactos/base/shell/explorer/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/z… Modified: trunk/reactos/base/shell/explorer/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/z… Modified: trunk/reactos/base/shell/explorer/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/resour…

1 0

[tfaber] 69939: [RTL] - Acquire the PEB lock before reading Peb->ProcessParameters->Environment in RtlQueryEnvironmentVariable_U. Patch by Mark Jansen. CORE-10381
by tfaber＠svn.reactos.org 19 Nov '15

19 Nov '15

Author: tfaber Date: Thu Nov 19 16:03:21 2015 New Revision: 69939 URL: http://svn.reactos.org/svn/reactos?rev=69939&view=rev Log: [RTL] - Acquire the PEB lock before reading Peb->ProcessParameters->Environment in RtlQueryEnvironmentVariable_U. Patch by Mark Jansen. CORE-10381 Modified: trunk/reactos/lib/rtl/env.c Modified: trunk/reactos/lib/rtl/env.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/env.c?rev=69939&r1… ============================================================================== --- trunk/reactos/lib/rtl/env.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/env.c [iso-8859-1] Thu Nov 19 16:03:21 2015 @@ -524,6 +524,7 @@ { PPEB Peb = RtlGetCurrentPeb(); if (Peb) { + RtlAcquirePebLock(); Environment = Peb->ProcessParameters->Environment; SysEnvUsed = TRUE; } @@ -531,12 +532,12 @@ if (Environment == NULL) { + if (SysEnvUsed) + RtlReleasePebLock(); return(STATUS_VARIABLE_NOT_FOUND); } Value->Length = 0; - if (SysEnvUsed) - RtlAcquirePebLock(); wcs = Environment; DPRINT("Starting search at :%p\n", wcs);

1 0

[rnaumann] 69938: [EXPLORER] Update some bitmaps by Jared Smudde, that I missed in r69734. Explorer Resource Revamp Part 2/3
by rnaumann＠svn.reactos.org 19 Nov '15

19 Nov '15

Author: rnaumann Date: Thu Nov 19 15:57:14 2015 New Revision: 69938 URL: http://svn.reactos.org/svn/reactos?rev=69938&view=rev Log: [EXPLORER] Update some bitmaps by Jared Smudde, that I missed in r69734. Explorer Resource Revamp Part 2/3 Modified: trunk/reactos/base/shell/explorer/res/bmp/146.bmp trunk/reactos/base/shell/explorer/res/bmp/147.bmp trunk/reactos/base/shell/explorer/res/bmp/148.bmp trunk/reactos/base/shell/explorer/res/bmp/149.bmp trunk/reactos/base/shell/explorer/res/bmp/150.bmp trunk/reactos/base/shell/explorer/res/bmp/151.bmp trunk/reactos/base/shell/explorer/res/bmp/152.bmp trunk/reactos/base/shell/explorer/res/bmp/153.bmp Modified: trunk/reactos/base/shell/explorer/res/bmp/146.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/bm… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/bmp/147.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/bm… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/bmp/148.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/bm… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/bmp/149.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/bm… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/bmp/150.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/bm… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/bmp/151.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/bm… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/bmp/152.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/bm… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/bmp/153.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/bm… ============================================================================== Binary files - no diff available.

1 0

[hbelusca] 69937: [USER32] - Fix MB_GetString: the input parameter is the ID of the button string to be retrieved, ranging from 0 to 10 inclusive (this corresponds to the IDOK ... IDCONTINUE range, ...
by hbelusca＠svn.reactos.org 19 Nov '15

19 Nov '15

Author: hbelusca Date: Thu Nov 19 13:42:55 2015 New Revision: 69937 URL: http://svn.reactos.org/svn/reactos?rev=69937&view=rev Log: [USER32] - Fix MB_GetString: the input parameter is the ID of the button string to be retrieved, ranging from 0 to 10 inclusive (this corresponds to the IDOK ... IDCONTINUE range, minus one). - Add the missing "Close" button string. Modified: trunk/reactos/win32ss/user/user32/include/resource.h trunk/reactos/win32ss/user/user32/lang/bg-BG.rc trunk/reactos/win32ss/user/user32/lang/cs-CZ.rc trunk/reactos/win32ss/user/user32/lang/da-DK.rc trunk/reactos/win32ss/user/user32/lang/de-DE.rc trunk/reactos/win32ss/user/user32/lang/el-GR.rc trunk/reactos/win32ss/user/user32/lang/en-US.rc trunk/reactos/win32ss/user/user32/lang/es-ES.rc trunk/reactos/win32ss/user/user32/lang/fr-FR.rc trunk/reactos/win32ss/user/user32/lang/he-IL.rc trunk/reactos/win32ss/user/user32/lang/hu-HU.rc trunk/reactos/win32ss/user/user32/lang/id-ID.rc trunk/reactos/win32ss/user/user32/lang/it-IT.rc trunk/reactos/win32ss/user/user32/lang/ja-JP.rc trunk/reactos/win32ss/user/user32/lang/lt-LT.rc trunk/reactos/win32ss/user/user32/lang/nl-NL.rc trunk/reactos/win32ss/user/user32/lang/no-NO.rc trunk/reactos/win32ss/user/user32/lang/pl-PL.rc trunk/reactos/win32ss/user/user32/lang/pt-BR.rc trunk/reactos/win32ss/user/user32/lang/ro-RO.rc trunk/reactos/win32ss/user/user32/lang/ru-RU.rc trunk/reactos/win32ss/user/user32/lang/sk-SK.rc trunk/reactos/win32ss/user/user32/lang/sv-SE.rc trunk/reactos/win32ss/user/user32/lang/tr-TR.rc trunk/reactos/win32ss/user/user32/lang/uk-UA.rc trunk/reactos/win32ss/user/user32/lang/zh-CN.rc trunk/reactos/win32ss/user/user32/windows/messagebox.c Modified: trunk/reactos/win32ss/user/user32/include/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ… ============================================================================== --- trunk/reactos/win32ss/user/user32/include/resource.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/include/resource.h [iso-8859-1] Thu Nov 19 13:42:55 2015 @@ -8,6 +8,13 @@ #pragma once #define IDS_ERROR (2) + +/* + * Button names IDs. + * + * The low value must be equal to the corresponding + * IDOK ... IDCONTINUE values, minus one. + */ #define IDS_OK (800) #define IDS_CANCEL (801) #define IDS_ABORT (802) @@ -15,6 +22,7 @@ #define IDS_IGNORE (804) #define IDS_YES (805) #define IDS_NO (806) +#define IDS_CLOSE (807) #define IDS_HELP (808) #define IDS_TRYAGAIN (809) #define IDS_CONTINUE (810) Modified: trunk/reactos/win32ss/user/user32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/b… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/bg-BG.rc [iso-8859-1] Thu Nov 19 13:42:55 2015 @@ -65,6 +65,7 @@ IDS_IGNORE "ÐÑÐµÐ½Ðµ&Ð±ÑÐµÐ³Ð²Ð°Ð½Ðµ" IDS_YES "&ÐÐ°" IDS_NO "&ÐÐµ" + IDS_CLOSE "&ÐÐ°ÑÐ²Ð°ÑÑÐ½Ðµ" IDS_HELP "ÐÐ¾Ð¼Ð¾Ñ" IDS_TRYAGAIN "&ÐÐ¾Ð² Ð¾Ð¿Ð¸Ñ" IDS_CONTINUE "ÐÑÐ¾&Ð´ÑÐ»Ð¶Ð°Ð²Ð°Ð½Ðµ" Modified: trunk/reactos/win32ss/user/user32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/c… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/cs-CZ.rc [iso-8859-1] Thu Nov 19 13:42:55 2015 @@ -70,6 +70,7 @@ IDS_IGNORE "&Ignorovat" IDS_YES "&Ano" IDS_NO "&Ne" + IDS_CLOSE "&ZavÅÃt" IDS_HELP "NÃ¡povÄda" IDS_TRYAGAIN "Z&kusit znovu" IDS_CONTINUE "P&okraÄovat" Modified: trunk/reactos/win32ss/user/user32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/da-DK.rc [iso-8859-1] Thu Nov 19 13:42:55 2015 @@ -65,6 +65,7 @@ IDS_IGNORE "&Ignorer" IDS_YES "&Ja" IDS_NO "&Nej" + IDS_CLOSE "&Luk" IDS_HELP "HjÃ¦lp" IDS_TRYAGAIN "&ForsÃ¸g Igen" IDS_CONTINUE "&ForsÃ¦t" Modified: trunk/reactos/win32ss/user/user32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/de-DE.rc [iso-8859-1] Thu Nov 19 13:42:55 2015 @@ -67,6 +67,7 @@ IDS_IGNORE "&Ignorieren" IDS_YES "&Ja" IDS_NO "&Nein" + IDS_CLOSE "S&chlieÃen" IDS_HELP "Hilfe" IDS_TRYAGAIN "&Wiederholen" IDS_CONTINUE "&Weiter" Modified: trunk/reactos/win32ss/user/user32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/e… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/el-GR.rc [iso-8859-1] Thu Nov 19 13:42:55 2015 @@ -65,6 +65,7 @@ IDS_IGNORE "Î Î±ÏÎ¬&Î²Î»ÎµÏÎ·" IDS_YES "&ÎÎ±Î¹" IDS_NO "Î&ÏÎ¹" + IDS_CLOSE "&ÎÎ»ÎµÎ¯ÏÎ·Î¼Î¿" IDS_HELP "ÎÎ¿Î®Î¸ÎµÎ¹Î±" IDS_TRYAGAIN "&ÎÏÎ±Î½Î¬Î»Î·ÏÎ·" IDS_CONTINUE "&Î£ÏÎ½ÎÏÎµÎ¹Î±" Modified: trunk/reactos/win32ss/user/user32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/e… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/en-US.rc [iso-8859-1] Thu Nov 19 13:42:55 2015 @@ -65,6 +65,7 @@ IDS_IGNORE "&Ignore" IDS_YES "&Yes" IDS_NO "&No" + IDS_CLOSE "&Close" IDS_HELP "Help" IDS_TRYAGAIN "&Try Again" IDS_CONTINUE "&Continue" Modified: trunk/reactos/win32ss/user/user32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/e… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/es-ES.rc [iso-8859-1] Thu Nov 19 13:42:55 2015 @@ -65,6 +65,7 @@ IDS_IGNORE "&Ignorar" IDS_YES "&Si" IDS_NO "&No" + IDS_CLOSE "&Cerrar" IDS_HELP "Ayuda" IDS_TRYAGAIN "In&tentar Otra vez" IDS_CONTINUE "&Continuar" Modified: trunk/reactos/win32ss/user/user32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/f… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/fr-FR.rc [iso-8859-1] Thu Nov 19 13:42:55 2015 @@ -67,6 +67,7 @@ IDS_IGNORE "&Ignorer" IDS_YES "&Oui" IDS_NO "&Non" + IDS_CLOSE "&Fermer" IDS_HELP "Aide" IDS_TRYAGAIN "R&ecommencer" IDS_CONTINUE "&Continuer" Modified: trunk/reactos/win32ss/user/user32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/h… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/he-IL.rc [iso-8859-1] Thu Nov 19 13:42:55 2015 @@ -65,6 +65,7 @@ IDS_IGNORE "×&×ª×¢××" IDS_YES "&××" IDS_NO "&××" + IDS_CLOSE "&×¡×××¨" IDS_HELP "×¢××¨×" IDS_TRYAGAIN "&× ×¡× ×©××" IDS_CONTINUE "&×××©×" Modified: trunk/reactos/win32ss/user/user32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/h… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/hu-HU.rc [iso-8859-1] Thu Nov 19 13:42:55 2015 @@ -67,6 +67,7 @@ IDS_IGNORE "&TovÃ¡bb" IDS_YES "&Igen" IDS_NO "&Nem" + IDS_CLOSE "&BezÃ¡r" IDS_HELP "SÃºgÃ³" IDS_TRYAGAIN "&Ãjra" IDS_CONTINUE "&Folytat" Modified: trunk/reactos/win32ss/user/user32/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/i… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/id-ID.rc [iso-8859-1] Thu Nov 19 13:42:55 2015 @@ -65,6 +65,7 @@ IDS_IGNORE "Aba&ikan" IDS_YES "&Ya" IDS_NO "&Tidak" + IDS_CLOSE "T&utup" IDS_HELP "Bantuan" IDS_TRYAGAIN "&Coba Lagi" IDS_CONTINUE "&Lanjutkan" Modified: trunk/reactos/win32ss/user/user32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/i… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/it-IT.rc [iso-8859-1] Thu Nov 19 13:42:55 2015 @@ -65,6 +65,7 @@ IDS_IGNORE "&Ignora" IDS_YES "&Si" IDS_NO "&No" + IDS_CLOSE "&Chiudi" IDS_HELP "Aiuto" IDS_TRYAGAIN "&Prova ancora" IDS_CONTINUE "&Continua" Modified: trunk/reactos/win32ss/user/user32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/j… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/ja-JP.rc [iso-8859-1] Thu Nov 19 13:42:55 2015 @@ -65,6 +65,7 @@ IDS_IGNORE "ç¡è¦(&I)" IDS_YES "ã¯ã(&Y)" IDS_NO "ããã(&N)" + IDS_CLOSE "éãã(&C)" IDS_HELP "ãã«ã" IDS_TRYAGAIN "åè©¦è¡ãã(&T)" IDS_CONTINUE "ç¶ãã(&C)" Modified: trunk/reactos/win32ss/user/user32/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/l… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/lt-LT.rc [iso-8859-1] Thu Nov 19 13:42:55 2015 @@ -67,6 +67,7 @@ IDS_IGNORE "&Praleisti" IDS_YES "&Taip" IDS_NO "&Ne" + IDS_CLOSE "&UÃ¾verti" IDS_HELP "Pagalba" IDS_TRYAGAIN "&Bandyti vÃ«l" IDS_CONTINUE "TÃ¦&sti" Modified: trunk/reactos/win32ss/user/user32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/n… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/nl-NL.rc [iso-8859-1] Thu Nov 19 13:42:55 2015 @@ -65,6 +65,7 @@ IDS_IGNORE "&Negeren" IDS_YES "&Ja" IDS_NO "&Nee" + IDS_CLOSE "&Afsluiten" IDS_HELP "Help" IDS_TRYAGAIN "&Probeer opnieuw" IDS_CONTINUE "&Verder" Modified: trunk/reactos/win32ss/user/user32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/n… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/no-NO.rc [iso-8859-1] Thu Nov 19 13:42:55 2015 @@ -65,6 +65,7 @@ IDS_IGNORE "&Ignorer" IDS_YES "&Ja" IDS_NO "&Nei" + IDS_CLOSE "&Lukk" IDS_HELP "Hjelp" IDS_TRYAGAIN "&PrÃ¸v pÃ¥ nytt" IDS_CONTINUE "&Fortsett" Modified: trunk/reactos/win32ss/user/user32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/p… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/pl-PL.rc [iso-8859-1] Thu Nov 19 13:42:55 2015 @@ -70,6 +70,7 @@ IDS_IGNORE "&Ignoruj" IDS_YES "&Tak" IDS_NO "&Nie" + IDS_CLOSE "Zam&knij" IDS_HELP "Pomoc" IDS_TRYAGAIN "&PonÃ³w prÃ³bÄ" IDS_CONTINUE "&Kontynuuj" Modified: trunk/reactos/win32ss/user/user32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/p… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/pt-BR.rc [iso-8859-1] Thu Nov 19 13:42:55 2015 @@ -67,6 +67,7 @@ IDS_IGNORE "&Ignorar" IDS_YES "&Sim" IDS_NO "&NÃ£o" + IDS_CLOSE "&Fechar" IDS_HELP "Ajuda" IDS_TRYAGAIN "&Tentar Novamente" IDS_CONTINUE "&Continuar" Modified: trunk/reactos/win32ss/user/user32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/r… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/ro-RO.rc [iso-8859-1] Thu Nov 19 13:42:55 2015 @@ -70,7 +70,8 @@ IDS_IGNORE "Ign&orÄ" IDS_YES "D&a" IDS_NO "N&u" - IDS_HELP "&Manualâ¦" + IDS_CLOSE "Ã&nchide" + IDS_HELP "Manual" IDS_TRYAGAIN "&ReÃ®ncearcÄ" IDS_CONTINUE "&ContinuÄ" END Modified: trunk/reactos/win32ss/user/user32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/r… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/ru-RU.rc [iso-8859-1] Thu Nov 19 13:42:55 2015 @@ -65,6 +65,7 @@ IDS_IGNORE "&ÐÑÐ¾Ð¿ÑÑÑÐ¸ÑÑ" IDS_YES "&ÐÐ°" IDS_NO "&ÐÐµÑ" + IDS_CLOSE "&ÐÐ°ÐºÑÑÑÑ" IDS_HELP "Ð¡Ð¿ÑÐ°Ð²ÐºÐ°" IDS_TRYAGAIN "&ÐÐ¾Ð²ÑÐ¾ÑÐ¸ÑÑ" IDS_CONTINUE "&ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ" Modified: trunk/reactos/win32ss/user/user32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/s… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/sk-SK.rc [iso-8859-1] Thu Nov 19 13:42:55 2015 @@ -67,6 +67,7 @@ IDS_IGNORE "&IgnorovaÅ¥" IDS_YES "Ãn&o" IDS_NO "&Nie" + IDS_CLOSE "&ZavrieÅ¥" IDS_HELP "Pomoc" IDS_TRYAGAIN "&SkÃºsiÅ¥ znova" IDS_CONTINUE "&PokraÄovaÅ¥" Modified: trunk/reactos/win32ss/user/user32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/s… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/sv-SE.rc [iso-8859-1] Thu Nov 19 13:42:55 2015 @@ -67,6 +67,7 @@ IDS_IGNORE "&Ignorera" IDS_YES "&Ja" IDS_NO "&Nej" + IDS_CLOSE "&StÃ¤ng" IDS_HELP "HjÃ¤lp" IDS_TRYAGAIN "&FÃ¶rsÃ¶k igen" IDS_CONTINUE "F&ortsÃ¤tt" Modified: trunk/reactos/win32ss/user/user32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/t… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/tr-TR.rc [iso-8859-1] Thu Nov 19 13:42:55 2015 @@ -67,6 +67,7 @@ IDS_IGNORE "&Yoksay" IDS_YES "&Evet" IDS_NO "&HayÄ±r" + IDS_CLOSE "&Kapat" IDS_HELP "YardÄ±m" IDS_TRYAGAIN "&Yeniden Dene" IDS_CONTINUE "&Devam" Modified: trunk/reactos/win32ss/user/user32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/u… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/uk-UA.rc [iso-8859-1] Thu Nov 19 13:42:55 2015 @@ -65,6 +65,7 @@ IDS_IGNORE "ÐÑ&Ð¾Ð¿ÑÑÑÐ¸ÑÐ¸" IDS_YES "&Ð¢Ð°Ðº" IDS_NO "Ð&Ñ" + IDS_CLOSE "&ÐÐ°ÐºÑÐ¸ÑÐ¸" IDS_HELP "ÐÐ¾Ð²ÑÐ´ÐºÐ°" IDS_TRYAGAIN "ÐÐ¾&Ð²ÑÐ¾ÑÐ¸ÑÐ¸" IDS_CONTINUE "&ÐÑÐ¾Ð´Ð¾Ð²Ð¶Ð¸ÑÐ¸" Modified: trunk/reactos/win32ss/user/user32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/z… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/zh-CN.rc [iso-8859-1] Thu Nov 19 13:42:55 2015 @@ -20,7 +20,7 @@ BEGIN MENUITEM "æ¤é(&U)", EM_UNDO MENUITEM SEPARATOR - MENUITEM "åªå(&t)", WM_CUT + MENUITEM "åªå(&T)", WM_CUT MENUITEM "å¤å¶(&C)", WM_COPY MENUITEM "ç²è´´(&P)", WM_PASTE MENUITEM "å é¤(&D)", WM_CLEAR @@ -34,8 +34,8 @@ MENUITEM "è¿å(&R)", SC_RESTORE MENUITEM "ç§»å¨(&M)", SC_MOVE MENUITEM "å¤§å°(&S)", SC_SIZE - MENUITEM "æå°å(&n)", SC_MINIMIZE - MENUITEM "æå¤§å(&x)", SC_MAXIMIZE + MENUITEM "æå°å(&N)", SC_MINIMIZE + MENUITEM "æå¤§å(&X)", SC_MAXIMIZE MENUITEM SEPARATOR MENUITEM "å³é(&C)\tAlt+F4", SC_CLOSE END @@ -45,8 +45,8 @@ MENUITEM "è¿å(&R)", SC_RESTORE MENUITEM "ç§»å¨(&M)", SC_MOVE MENUITEM "å¤§å°(&S)", SC_SIZE - MENUITEM "æå°å(&n)", SC_MINIMIZE - MENUITEM "æå¤§å(&x)", SC_MAXIMIZE + MENUITEM "æå°å(&N)", SC_MINIMIZE + MENUITEM "æå¤§å(&X)", SC_MAXIMIZE MENUITEM SEPARATOR MENUITEM "å³é(&C)\tCtrl+F4", SC_CLOSE MENUITEM SEPARATOR @@ -65,6 +65,7 @@ IDS_IGNORE "å¿½ç¥(&I)" IDS_YES "æ¯(&Y)" IDS_NO "å¦(&N)" + IDS_CLOSE "å³é(&C)" IDS_HELP "å¸®å©" IDS_TRYAGAIN "éè¯(&T)" IDS_CONTINUE "ç»§ç»(&C)" Modified: trunk/reactos/win32ss/user/user32/windows/messagebox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/messagebox.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/messagebox.c [iso-8859-1] Thu Nov 19 13:42:55 2015 @@ -1055,10 +1055,14 @@ { LPCWSTR btnStr = NULL; - /* The allowable IDs are between IDOK (0) and IDCONTINUE (11) inclusive */ - if (wBtn >= IDCONTINUE) + /* + * The allowable IDs are between "IDOK - 1" (0) and "IDCONTINUE - 1" (10) inclusive. + * See psdk/winuser.h and user32/include/resource.h . + */ + if (wBtn > IDCONTINUE - 1) return NULL; + wBtn += 800; // See user32/include/resource.h LoadStringW(User32Instance, wBtn, (LPWSTR)&btnStr, 0); return btnStr; }

1 0

[hbelusca] 69936: [USER32] Implement now-documented MB_GetString. See: https://msdn.microsoft.com/en-us/library/windows/desktop/dn910915(v=vs.85).aspx and: http://undoc.airesoft.co.uk/user32.dll/MB...
by hbelusca＠svn.reactos.org 19 Nov '15

19 Nov '15

Author: hbelusca Date: Thu Nov 19 00:30:27 2015 New Revision: 69936 URL: http://svn.reactos.org/svn/reactos?rev=69936&view=rev Log: [USER32] Implement now-documented MB_GetString. See: https://msdn.microsoft.com/en-us/library/windows/desktop/dn910915(v=vs.85).… and: http://undoc.airesoft.co.uk/user32.dll/MB_GetString.php for more information. Modified: trunk/reactos/win32ss/user/user32/windows/messagebox.c Modified: trunk/reactos/win32ss/user/user32/windows/messagebox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/messagebox.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/messagebox.c [iso-8859-1] Thu Nov 19 00:30:27 2015 @@ -1046,11 +1046,21 @@ /* * @implemented - */ -LPWSTR WINAPI MB_GetString(DWORD string) -{ - UNIMPLEMENTED; - return NULL; + * + * See: https://msdn.microsoft.com/en-us/library/windows/desktop/dn910915(v=vs.85).… + * and: http://undoc.airesoft.co.uk/user32.dll/MB_GetString.php + * for more information. + */ +LPCWSTR WINAPI MB_GetString(UINT wBtn) +{ + LPCWSTR btnStr = NULL; + + /* The allowable IDs are between IDOK (0) and IDCONTINUE (11) inclusive */ + if (wBtn >= IDCONTINUE) + return NULL; + + LoadStringW(User32Instance, wBtn, (LPWSTR)&btnStr, 0); + return btnStr; } /* EOF */

1 0

[hbelusca] 69935: [USER32] MessageBoxIndirect fixes by Carlo Bramini: - Implemented loading of text and caption if they are detected as resource IDs. - Use direct resource string pointers with Load...
by hbelusca＠svn.reactos.org 18 Nov '15

18 Nov '15

Author: hbelusca Date: Wed Nov 18 23:46:38 2015 New Revision: 69935 URL: http://svn.reactos.org/svn/reactos?rev=69935&view=rev Log: [USER32] MessageBoxIndirect fixes by Carlo Bramini: - Implemented loading of text and caption if they are detected as resource IDs. - Use direct resource string pointers with LoadStringW and use the returned string length. - Dramatically improve the implementation of ID and resource string assignments, by using a little look up table. This removes some ugly, difficult to maintain copy-paste code. - Fix the scaling of logical coordinates by making it aware of rounding, i.e. the size of the controls is now calculated correctly. CORE-10352 #resolve #comment Thank you for the patch! :D Modified: trunk/reactos/win32ss/user/user32/windows/messagebox.c Modified: trunk/reactos/win32ss/user/user32/windows/messagebox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/messagebox.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/messagebox.c [iso-8859-1] Wed Nov 18 23:46:38 2015 @@ -21,7 +21,7 @@ * PROJECT: ReactOS user32.dll * FILE: win32ss/user/user32/windows/messagebox.c * PURPOSE: Input - * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Thomas Weidenmueller (w3seek(a)users.sourceforge.net) * UPDATE HISTORY: * 2003/07/28 Added some NT features @@ -42,27 +42,69 @@ #define MSGBOX_IDICON (1088) #define MSGBOX_IDTEXT (100) -#define IDI_HANDA MAKEINTRESOURCEA(32513) #define IDI_HANDW MAKEINTRESOURCEW(32513) -#define IDI_QUESTIONA MAKEINTRESOURCEA(32514) #define IDI_QUESTIONW MAKEINTRESOURCEW(32514) -#define IDI_EXCLAMATIONA MAKEINTRESOURCEA(32515) #define IDI_EXCLAMATIONW MAKEINTRESOURCEW(32515) -#define IDI_ASTERISKA MAKEINTRESOURCEA(32516) #define IDI_ASTERISKW MAKEINTRESOURCEW(32516) -#define IDI_WINLOGOA MAKEINTRESOURCEA(32517) #define IDI_WINLOGOW MAKEINTRESOURCEW(32517) + + +/* MessageBox metrics */ #define BTN_CX (75) #define BTN_CY (23) -#define MSGBOXEX_SPACING (16) +#define MSGBOXEX_SPACING (16) #define MSGBOXEX_BUTTONSPACING (6) -#define MSGBOXEX_MARGIN (12) -#define MSGBOXEX_MAXBTNSTR (32) -#define MSGBOXEX_MAXBTNS (4) - -typedef struct _MSGBOXINFO { +#define MSGBOXEX_MARGIN (12) +#define MSGBOXEX_MAXBTNSTR (32) +#define MSGBOXEX_MAXBTNS (4) + +/* Rescale logical coordinates */ +#define RESCALE_X(_x, _unit) (((_x) * 4 + LOWORD(_unit) - 1) / LOWORD(_unit)) +#define RESCALE_Y(_y, _unit) (((_y) * 8 + HIWORD(_unit) - 1) / HIWORD(_unit)) + + +/* MessageBox button helpers */ + +#define DECLARE_MB_1(_btn0) \ + { 1, { ID##_btn0, 0, 0 }, { IDS_##_btn0, 0, 0 } } + +#define DECLARE_MB_2(_btn0, _btn1) \ + { 2, { ID##_btn0, ID##_btn1, 0 }, { IDS_##_btn0, IDS_##_btn1, 0 } } + +#define DECLARE_MB_3(_btn0, _btn1, _btn2) \ + { 3, { ID##_btn0, ID##_btn1, ID##_btn2 }, { IDS_##_btn0, IDS_##_btn1, IDS_##_btn2 } } + +typedef struct _MSGBTNINFO +{ + LONG btnCnt; + LONG btnIdx[MSGBOXEX_MAXBTNS]; + UINT btnIds[MSGBOXEX_MAXBTNS]; +} MSGBTNINFO, *PMSGBTNINFO; + +/* Default MessageBox buttons */ +static const MSGBTNINFO MsgBtnInfo[] = +{ + /* MB_OK (0) */ + DECLARE_MB_1(OK), + /* MB_OKCANCEL (1) */ + DECLARE_MB_2(OK, CANCEL), + /* MB_ABORTRETRYIGNORE (2) */ + DECLARE_MB_3(ABORT, RETRY, IGNORE), + /* MB_YESNOCANCEL (3) */ + DECLARE_MB_3(YES, NO, CANCEL), + /* MB_YESNO (4) */ + DECLARE_MB_2(YES, NO), + /* MB_RETRYCANCEL (5) */ + DECLARE_MB_2(RETRY, CANCEL), + /* MB_CANCELTRYCONTINUE (6) */ + DECLARE_MB_3(CANCEL, TRYAGAIN, CONTINUE) +}; + + +typedef struct _MSGBOXINFO +{ MSGBOXPARAMSW; // Wine passes this too. // ReactOS HICON Icon; @@ -83,49 +125,45 @@ LPWSTR pszBuffer, pszBufferPos, pMessageBoxText, pszTitle, pszText, pszButton; WCHAR szButton[MSGBOXEX_MAXBTNSTR]; HGLOBAL hGlobal; - - static const WCHAR szLine[30] = - {'-','-','-','-','-','-','-','-','-','-','-','-','-','-','-', - '-','-','-','-','-','-','-','-','-','-','-','-','\r','\n', 0}; - + + static const WCHAR szLine[] = L"---------------------------\r\n"; + mbi = (PMSGBOXINFO)GetPropW(DialogWindow, L"ROS_MSGBOX"); hwndText = GetDlgItem(DialogWindow, MSGBOX_IDTEXT); cchTitle = GetWindowTextLengthW(DialogWindow) + 1; cchText = GetWindowTextLengthW(hwndText) + 1; - - if(!mbi) + + if (!mbi) return; - + pMessageBoxText = (LPWSTR)RtlAllocateHeap(GetProcessHeap(), 0, (cchTitle + cchText) * sizeof(WCHAR)); - - if(pMessageBoxText == NULL) + + if (pMessageBoxText == NULL) { RtlFreeHeap(GetProcessHeap(), 0, pMessageBoxText); return; } - + pszTitle = pMessageBoxText; pszText = pMessageBoxText + cchTitle; - - - - if(GetWindowTextW(DialogWindow, pszTitle, cchTitle) == 0 || - GetWindowTextW(hwndText, pszText, cchText) == 0) + + if (GetWindowTextW(DialogWindow, pszTitle, cchTitle) == 0 || + GetWindowTextW(hwndText, pszText, cchText) == 0) { RtlFreeHeap(GetProcessHeap(), 0, pMessageBoxText); return; } - - /* + + /* * Calculate the total buffer size. */ cchTotal = 6 + cchTitle + cchText + (lstrlenW(szLine) * 4) + (mbi->nButtons * MSGBOXEX_MAXBTNSTR + 3); - + hGlobal = GlobalAlloc(GHND, cchTotal * sizeof(WCHAR)); - + pszBuffer = (LPWSTR)GlobalLock(hGlobal); - - if(pszBuffer == NULL) + + if (pszBuffer == NULL) { RtlFreeHeap(GetProcessHeap(), 0, pMessageBoxText); GlobalFree(hGlobal); @@ -142,22 +180,22 @@ */ cchBuffer = wsprintfW(pszBuffer, L"%s%s\r\n%s%s\r\n%s", szLine, pszTitle, szLine, pszText, szLine); pszBufferPos = pszBuffer + cchBuffer; - - for(i = 0; i < mbi->nButtons; i++) + + for (i = 0; i < mbi->nButtons; i++) { GetDlgItemTextW(DialogWindow, mbi->Btns[i], szButton, MSGBOXEX_MAXBTNSTR); - + cchButton = strlenW(szButton); pszButton = szButton; - + /* Skip '&' character. */ - if(szButton[0] == '&') + if (szButton[0] == '&') { pszButton = pszButton + 1; cchButton = cchButton - 1; } - for(n = 0; n < cchButton; n++) + for (n = 0; n < cchButton; n++) *(pszBufferPos++) = pszButton[n]; /* Add spaces. */ @@ -165,12 +203,12 @@ *(pszBufferPos++) = L' '; *(pszBufferPos++) = L' '; } - + wsprintfW(pszBufferPos, L"\r\n%s", szLine); - + GlobalUnlock(hGlobal); - if(OpenClipboard(DialogWindow)) + if (OpenClipboard(DialogWindow)) { EmptyClipboard(); SetClipboardData(CF_UNICODETEXT, hGlobal); @@ -276,7 +314,7 @@ return 0; } return 0; - + case WM_COPY: MessageBoxTextToClipboard(hwnd); return 0; @@ -328,16 +366,16 @@ DLGTEMPLATE *tpl; DLGITEMTEMPLATE *iico, *itxt; NONCLIENTMETRICSW nclm; - WCHAR capbuf[32]; LPVOID buf; BYTE *dest; LPCWSTR caption, text; HFONT hFont; HICON Icon; HDC hDC; - int bufsize, ret, caplen, textlen, btnlen, i, btnleft, btntop, lmargin, nButtons = 0; - LONG Buttons[MSGBOXEX_MAXBTNS]; - WCHAR ButtonText[MSGBOXEX_MAXBTNS][MSGBOXEX_MAXBTNSTR]; + int bufsize, ret, caplen, textlen, i, btnleft, btntop, lmargin; + MSGBTNINFO Buttons; + LPCWSTR ButtonText[MSGBOXEX_MAXBTNS]; + int ButtonLen[MSGBOXEX_MAXBTNS]; DLGITEMTEMPLATE *ibtn[MSGBOXEX_MAXBTNS]; RECT btnrect, txtrect, rc; SIZE btnsize; @@ -345,68 +383,56 @@ BOOL defbtn = FALSE; DWORD units = GetDialogBaseUnits(); - if(!lpMsgBoxParams->lpszCaption || !HIWORD((LPWSTR)lpMsgBoxParams->lpszCaption)) - { - LoadStringW(User32Instance, IDS_ERROR, &capbuf[0], 32); - caption = &capbuf[0]; + if (!lpMsgBoxParams->lpszCaption) + { + /* No caption, use the default one */ + caplen = LoadStringW(User32Instance, IDS_ERROR, (LPWSTR)&caption, 0); + } + else if (IS_INTRESOURCE(lpMsgBoxParams->lpszCaption)) + { + /* User-defined resource string */ + caplen = LoadStringW(lpMsgBoxParams->hInstance, (UINT)lpMsgBoxParams->lpszCaption, (LPWSTR)&caption, 0); } else - caption = (LPWSTR)lpMsgBoxParams->lpszCaption; - - if(!lpMsgBoxParams->lpszText || !HIWORD(lpMsgBoxParams->lpszText)) - text = L""; + { + /* UNICODE string pointer */ + caption = lpMsgBoxParams->lpszCaption; + caplen = strlenW(caption); + } + + if (!lpMsgBoxParams->lpszText) + { + /* No text, use blank */ + text = L""; + textlen = 0; + } + else if (IS_INTRESOURCE(lpMsgBoxParams->lpszText)) + { + /* User-defined resource string */ + textlen = LoadStringW(lpMsgBoxParams->hInstance, (UINT)lpMsgBoxParams->lpszText, (LPWSTR)&text, 0); + } else - text = lpMsgBoxParams->lpszText; - - caplen = strlenW(caption); - textlen = strlenW(text); - - /* Create selected buttons */ - switch(lpMsgBoxParams->dwStyle & MB_TYPEMASK) - { - case MB_OKCANCEL: - Buttons[0] = IDOK; - Buttons[1] = IDCANCEL; - nButtons = 2; - break; - case MB_CANCELTRYCONTINUE: - Buttons[0] = IDCANCEL; - Buttons[1] = IDTRYAGAIN; - Buttons[2] = IDCONTINUE; - nButtons = 3; - break; - case MB_ABORTRETRYIGNORE: - Buttons[0] = IDABORT; - Buttons[1] = IDRETRY; - Buttons[2] = IDIGNORE; - nButtons = 3; - break; - case MB_YESNO: - Buttons[0] = IDYES; - Buttons[1] = IDNO; - nButtons = 2; - break; - case MB_YESNOCANCEL: - Buttons[0] = IDYES; - Buttons[1] = IDNO; - Buttons[2] = IDCANCEL; - nButtons = 3; - break; - case MB_RETRYCANCEL: - Buttons[0] = IDRETRY; - Buttons[1] = IDCANCEL; - nButtons = 2; - break; - case MB_OK: - /* fall through */ - default: - Buttons[0] = IDOK; - nButtons = 1; - break; - } - /* Create Help button */ - if(lpMsgBoxParams->dwStyle & MB_HELP) - Buttons[nButtons++] = IDHELP; + { + /* UNICODE string pointer */ + text = lpMsgBoxParams->lpszText; + textlen = strlenW(text); + } + + /* Create the selected buttons; unknown types will fall back to MB_OK */ + i = (lpMsgBoxParams->dwStyle & MB_TYPEMASK); + if (i >= ARRAYSIZE(MsgBtnInfo)) + i = MB_OK; + + /* Get buttons IDs */ + Buttons = MsgBtnInfo[i]; + + /* Add the Help button */ + if (lpMsgBoxParams->dwStyle & MB_HELP) + { + Buttons.btnIdx[Buttons.btnCnt] = IDHELP; + Buttons.btnIds[Buttons.btnCnt] = IDS_HELP; + Buttons.btnCnt++; + } switch(lpMsgBoxParams->dwStyle & MB_ICONMASK) { @@ -459,51 +485,24 @@ 3 * sizeof(WORD) + (textlen + 1) * sizeof(WCHAR); - - for(i = 0; i < nButtons; i++) - { - switch(Buttons[i]) - { - case IDOK: - LoadStringW(User32Instance, IDS_OK, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1); - break; - case IDCANCEL: - LoadStringW(User32Instance, IDS_CANCEL, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1); - break; - case IDYES: - LoadStringW(User32Instance, IDS_YES, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1); - break; - case IDNO: - LoadStringW(User32Instance, IDS_NO, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1); - break; - case IDTRYAGAIN: - LoadStringW(User32Instance, IDS_TRYAGAIN, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1); - break; - case IDCONTINUE: - LoadStringW(User32Instance, IDS_CONTINUE, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1); - break; - case IDABORT: - LoadStringW(User32Instance, IDS_ABORT, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1); - break; - case IDRETRY: - LoadStringW(User32Instance, IDS_RETRY, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1); - break; - case IDIGNORE: - LoadStringW(User32Instance, IDS_IGNORE, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1); - break; - case IDHELP: - LoadStringW(User32Instance, IDS_HELP, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1); - break; - default: - ButtonText[i][0] = (WCHAR)0; - break; - } + for (i = 0; i < Buttons.btnCnt; i++) + { + /* Get the default text of the buttons */ + if (Buttons.btnIds[i]) + { + ButtonLen[i] = LoadStringW(User32Instance, Buttons.btnIds[i], (LPWSTR)&ButtonText[i], 0); + } + else + { + ButtonText[i] = L""; + ButtonLen[i] = 0; + } /* Space for buttons */ bufsize = (bufsize + 3) & ~3; bufsize += sizeof(DLGITEMTEMPLATE) + 3 * sizeof(WORD) + - (wcslen(ButtonText[i]) + 1) * sizeof(WCHAR); + (ButtonLen[i] + 1) * sizeof(WCHAR); } buf = RtlAllocateHeap(GetProcessHeap(), 0, bufsize); @@ -513,11 +512,9 @@ } iico = itxt = NULL; - hDC = CreateCompatibleDC(0); - nclm.cbSize = sizeof(nclm); SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, sizeof(nclm), &nclm, 0); - hFont = CreateFontIndirectW (&nclm.lfMessageFont); + hFont = CreateFontIndirectW(&nclm.lfMessageFont); tpl = (DLGTEMPLATE *)buf; @@ -529,7 +526,7 @@ tpl->dwExtendedStyle |= WS_EX_RIGHT; tpl->x = 100; tpl->y = 100; - tpl->cdit = nButtons + ((Icon != (HICON)0) ? 1 : 0) + 1; + tpl->cdit = Buttons.btnCnt + ((Icon != (HICON)0) ? 1 : 0) + 1; dest = (BYTE *)(tpl + 1); @@ -585,11 +582,15 @@ *(WORD*)dest = 0; dest += sizeof(WORD); + hDC = CreateCompatibleDC(0); + SelectObject(hDC, hFont); + /* create buttons */ btnsize.cx = BTN_CX; btnsize.cy = BTN_CY; btnrect.left = btnrect.top = 0; - for(i = 0; i < nButtons; i++) + + for(i = 0; i < Buttons.btnCnt; i++) { dest = (BYTE*)(((UINT_PTR)dest + 3) & ~3); ibtn[i] = (DLGITEMTEMPLATE *)dest; @@ -597,27 +598,27 @@ if(!defbtn && (i == ((lpMsgBoxParams->dwStyle & MB_DEFMASK) >> 8))) { ibtn[i]->style |= BS_DEFPUSHBUTTON; - mbi.DefBtn = Buttons[i]; + mbi.DefBtn = Buttons.btnIdx[i]; defbtn = TRUE; } else ibtn[i]->style |= BS_PUSHBUTTON; ibtn[i]->dwExtendedStyle = 0; - ibtn[i]->id = Buttons[i]; + ibtn[i]->id = Buttons.btnIdx[i]; dest += sizeof(DLGITEMTEMPLATE); *(WORD*)dest = 0xFFFF; dest += sizeof(WORD); *(WORD*)dest = 0x0080; /* button control */ dest += sizeof(WORD); - btnlen = strlenW(ButtonText[i]); - memcpy(dest, ButtonText[i], btnlen * sizeof(WCHAR)); - dest += btnlen * sizeof(WCHAR); + memcpy(dest, ButtonText[i], ButtonLen[i] * sizeof(WCHAR)); + dest += ButtonLen[i] * sizeof(WCHAR); *(WORD*)dest = 0; dest += sizeof(WORD); *(WORD*)dest = 0; dest += sizeof(WORD); - SelectObject(hDC, hFont); - DrawTextW(hDC, ButtonText[i], btnlen, &btnrect, DT_LEFT | DT_SINGLELINE | DT_CALCRECT); + + // btnrect.right = btnrect.bottom = 0; // FIXME: Is it needed?? + DrawTextW(hDC, ButtonText[i], ButtonLen[i], &btnrect, DT_LEFT | DT_SINGLELINE | DT_CALCRECT); btnsize.cx = max(btnsize.cx, btnrect.right); btnsize.cy = max(btnsize.cy, btnrect.bottom); } @@ -627,7 +628,7 @@ { ibtn[0]->style &= ~BS_PUSHBUTTON; ibtn[0]->style |= BS_DEFPUSHBUTTON; - mbi.DefBtn = Buttons[0]; + mbi.DefBtn = Buttons.btnIdx[0]; } /* calculate position and size of controls */ @@ -635,7 +636,6 @@ if(Icon) txtrect.right -= GetSystemMetrics(SM_CXICON) + MSGBOXEX_SPACING; txtrect.top = txtrect.left = txtrect.bottom = 0; - SelectObject(hDC, hFont); if (textlen != 0) { DrawTextW(hDC, text, textlen, &txtrect, DT_LEFT | DT_NOPREFIX | DT_WORDBREAK | DT_CALCRECT); @@ -646,6 +646,9 @@ txtrect.bottom = txtrect.top + 1; } txtrect.right++; + + if(hDC) + DeleteDC(hDC); /* calculate position and size of the icon */ rc.left = rc.bottom = rc.right = 0; @@ -655,20 +658,20 @@ { rc.right = GetSystemMetrics(SM_CXICON); rc.bottom = GetSystemMetrics(SM_CYICON); - #ifdef MSGBOX_ICONVCENTER +#ifdef MSGBOX_ICONVCENTER rc.top = MSGBOXEX_MARGIN + (max(txtrect.bottom, rc.bottom) / 2) - (GetSystemMetrics(SM_CYICON) / 2); rc.top = max(MSGBOXEX_SPACING, rc.top); - #else +#else rc.top = MSGBOXEX_MARGIN; - #endif - btnleft = (nButtons * (btnsize.cx + MSGBOXEX_BUTTONSPACING)) - MSGBOXEX_BUTTONSPACING; +#endif + btnleft = (Buttons.btnCnt * (btnsize.cx + MSGBOXEX_BUTTONSPACING)) - MSGBOXEX_BUTTONSPACING; if(btnleft > txtrect.right + rc.right + MSGBOXEX_SPACING) { - #ifdef MSGBOX_TEXTHCENTER +#ifdef MSGBOX_TEXTHCENTER lmargin = MSGBOXEX_MARGIN + ((btnleft - txtrect.right - rc.right - MSGBOXEX_SPACING) / 2); - #else +#else lmargin = MSGBOXEX_MARGIN; - #endif +#endif btnleft = MSGBOXEX_MARGIN; } else @@ -677,23 +680,23 @@ btnleft = MSGBOXEX_MARGIN + ((txtrect.right + rc.right + MSGBOXEX_SPACING) / 2) - (btnleft / 2); } rc.left = lmargin; - iico->x = (rc.left * 4) / LOWORD(units); - iico->y = (rc.top * 8) / HIWORD(units); - iico->cx = (rc.right * 4) / LOWORD(units); - iico->cy = (rc.bottom * 8) / HIWORD(units); + iico->x = RESCALE_X(rc.left, units); + iico->y = RESCALE_Y(rc.top, units); + iico->cx = RESCALE_X(rc.right, units); + iico->cy = RESCALE_Y(rc.bottom, units); btntop = rc.top + rc.bottom + MSGBOXEX_SPACING; rc.left += rc.right + MSGBOXEX_SPACING; } else { - btnleft = (nButtons * (btnsize.cx + MSGBOXEX_BUTTONSPACING)) - MSGBOXEX_BUTTONSPACING; + btnleft = (Buttons.btnCnt * (btnsize.cx + MSGBOXEX_BUTTONSPACING)) - MSGBOXEX_BUTTONSPACING; if(btnleft > txtrect.right) { - #ifdef MSGBOX_TEXTHCENTER +#ifdef MSGBOX_TEXTHCENTER lmargin = MSGBOXEX_MARGIN + ((btnleft - txtrect.right) / 2); - #else +#else lmargin = MSGBOXEX_MARGIN; - #endif +#endif btnleft = MSGBOXEX_MARGIN; } else @@ -708,12 +711,12 @@ rc.top = max(rc.top, MSGBOXEX_MARGIN); /* calculate position of the buttons */ btntop = max(rc.top + txtrect.bottom + MSGBOXEX_SPACING, btntop); - for(i = 0; i < nButtons; i++) - { - ibtn[i]->x = (btnleft * 4) / LOWORD(units); - ibtn[i]->y = (btntop * 8) / HIWORD(units); - ibtn[i]->cx = (btnsize.cx * 4) / LOWORD(units); - ibtn[i]->cy = (btnsize.cy * 8) / HIWORD(units); + for(i = 0; i < Buttons.btnCnt; i++) + { + ibtn[i]->x = RESCALE_X(btnleft, units); + ibtn[i]->y = RESCALE_Y(btntop, units); + ibtn[i]->cx = RESCALE_X(btnsize.cx, units); + ibtn[i]->cy = RESCALE_Y(btnsize.cy, units); btnleft += btnsize.cx + MSGBOXEX_BUTTONSPACING; } /* calculate size and position of the messagebox window */ @@ -721,13 +724,13 @@ btnleft += MSGBOXEX_MARGIN; btntop += btnsize.cy + MSGBOXEX_MARGIN; /* set size and position of the message static */ - itxt->x = (rc.left * 4) / LOWORD(units); - itxt->y = (rc.top * 8) / HIWORD(units); - itxt->cx = (((btnleft - rc.left - MSGBOXEX_MARGIN) * 4) / LOWORD(units)); - itxt->cy = ((txtrect.bottom * 8) / HIWORD(units)); + itxt->x = RESCALE_X(rc.left, units); + itxt->y = RESCALE_Y(rc.top, units); + itxt->cx = RESCALE_X(btnleft - rc.left - MSGBOXEX_MARGIN, units); + itxt->cy = RESCALE_Y(txtrect.bottom, units); /* set size of the window */ - tpl->cx = (btnleft * 4) / LOWORD(units); - tpl->cy = (btntop * 8) / HIWORD(units); + tpl->cx = RESCALE_X(btnleft, units); + tpl->cy = RESCALE_Y(btntop, units); /* finally show the messagebox */ mbi.Icon = Icon; @@ -735,8 +738,8 @@ mbi.dwContextHelpId = lpMsgBoxParams->dwContextHelpId; mbi.lpfnMsgBoxCallback = lpMsgBoxParams->lpfnMsgBoxCallback; mbi.dwStyle = lpMsgBoxParams->dwStyle; - mbi.nButtons = nButtons; - mbi.Btns = &Buttons[0]; + mbi.nButtons = Buttons.btnCnt; + mbi.Btns = Buttons.btnIdx; mbi.Timeout = Timeout; /* Pass on to Justin Case so he can peek the message? */ @@ -748,11 +751,8 @@ mbi.lpszIcon = lpMsgBoxParams->lpszIcon; mbi.dwLanguageId = lpMsgBoxParams->dwLanguageId; - if(hDC) - DeleteDC(hDC); - - ret = DialogBoxIndirectParamW(lpMsgBoxParams->hInstance, tpl, lpMsgBoxParams->hwndOwner, - MessageBoxProc, (LPARAM)&mbi); + ret = DialogBoxIndirectParamW(lpMsgBoxParams->hInstance, tpl, lpMsgBoxParams->hwndOwner, + MessageBoxProc, (LPARAM)&mbi); if(hFont) DeleteObject(hFont); @@ -849,7 +849,7 @@ UNICODE_STRING textW, captionW, iconW; int ret; - if (HIWORD((UINT_PTR)lpMsgBoxParams->lpszText)) + if (!IS_INTRESOURCE(lpMsgBoxParams->lpszText)) { RtlCreateUnicodeStringFromAsciiz(&textW, (PCSZ)lpMsgBoxParams->lpszText); /* @@ -861,7 +861,7 @@ else textW.Buffer = (LPWSTR)lpMsgBoxParams->lpszText; - if (HIWORD((UINT_PTR)lpMsgBoxParams->lpszCaption)) + if (!IS_INTRESOURCE(lpMsgBoxParams->lpszCaption)) { RtlCreateUnicodeStringFromAsciiz(&captionW, (PCSZ)lpMsgBoxParams->lpszCaption); /* @@ -875,7 +875,7 @@ if(lpMsgBoxParams->dwStyle & MB_USERICON) { - if (HIWORD((UINT_PTR)lpMsgBoxParams->lpszIcon)) + if (!IS_INTRESOURCE(lpMsgBoxParams->lpszIcon)) { RtlCreateUnicodeStringFromAsciiz(&iconW, (PCSZ)lpMsgBoxParams->lpszIcon); /* @@ -903,13 +903,13 @@ ret = MessageBoxTimeoutIndirectW(&msgboxW, (UINT)-1); - if (HIWORD((UINT_PTR)lpMsgBoxParams->lpszText)) + if (!IS_INTRESOURCE(lpMsgBoxParams->lpszText)) RtlFreeUnicodeString(&textW); - if (HIWORD((UINT_PTR)lpMsgBoxParams->lpszCaption)) + if (!IS_INTRESOURCE(lpMsgBoxParams->lpszCaption)) RtlFreeUnicodeString(&captionW); - if ((lpMsgBoxParams->dwStyle & MB_USERICON) && HIWORD((UINT_PTR)iconW.Buffer)) + if ((lpMsgBoxParams->dwStyle & MB_USERICON) && !IS_INTRESOURCE(iconW.Buffer)) RtlFreeUnicodeString(&iconW); return ret; @@ -959,12 +959,12 @@ UNICODE_STRING textW, captionW; int ret; - if (HIWORD((UINT_PTR)lpText)) + if (!IS_INTRESOURCE(lpText)) RtlCreateUnicodeStringFromAsciiz(&textW, (PCSZ)lpText); else textW.Buffer = (LPWSTR)lpText; - if (HIWORD((UINT_PTR)lpCaption)) + if (!IS_INTRESOURCE(lpCaption)) RtlCreateUnicodeStringFromAsciiz(&captionW, (PCSZ)lpCaption); else captionW.Buffer = (LPWSTR)lpCaption; @@ -982,10 +982,10 @@ ret = MessageBoxTimeoutIndirectW(&msgboxW, (UINT)dwTime); - if (HIWORD(textW.Buffer)) + if (!IS_INTRESOURCE(textW.Buffer)) RtlFreeUnicodeString(&textW); - if (HIWORD(captionW.Buffer)) + if (!IS_INTRESOURCE(captionW.Buffer)) RtlFreeUnicodeString(&captionW); return ret;

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
46
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2015