Ros-diffs September 2019

ros-diffs@reactos.org

21 participants
115 discussions

[reactos] 04/05: [BROWSEUI] Fix a PIDL leak.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d41c5be3bd961f69b3ea4… commit d41c5be3bd961f69b3ea40b27565870972968b4e Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Sep 10 12:11:34 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Sep 22 11:42:06 2019 +0200 [BROWSEUI] Fix a PIDL leak. --- dll/win32/browseui/explorerband.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/dll/win32/browseui/explorerband.cpp b/dll/win32/browseui/explorerband.cpp index 741960c1d11..76bd7aa939c 100644 --- a/dll/win32/browseui/explorerband.cpp +++ b/dll/win32/browseui/explorerband.cpp @@ -1350,6 +1350,7 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM // Navigate to our new location UpdateBrowser(pidlNewAbs); + ILFree(pidlParent); ILFree(pidlNewAbs); ILFree(pidlNew); if (theResult)

5 years, 3 months

[reactos] 03/05: [SHLWAPI] Import Wine commit c8175e6c7a7 (Fix Stat() method for file streams) by Nikolay Sivov.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cfc5b3749fd4e3366fdfa… commit cfc5b3749fd4e3366fdfa033f80730032207e8b7 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Sep 8 11:22:22 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Sep 22 11:42:01 2019 +0200 [SHLWAPI] Import Wine commit c8175e6c7a7 (Fix Stat() method for file streams) by Nikolay Sivov. Fixes crash in shlwapi_winetest:istream. --- dll/win32/shlwapi/istream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shlwapi/istream.c b/dll/win32/shlwapi/istream.c index 946d2c84b6e..e773599c45f 100644 --- a/dll/win32/shlwapi/istream.c +++ b/dll/win32/shlwapi/istream.c @@ -298,7 +298,7 @@ static HRESULT WINAPI IStream_fnStat(IStream *iface, STATSTG* lpStat, TRACE("(%p,%p,%d)\n", This, lpStat, grfStatFlag); - if (!grfStatFlag) + if (!lpStat) return STG_E_INVALIDPOINTER; memset(&fi, 0, sizeof(fi));

5 years, 3 months

[reactos] 02/05: [SHELL32] Handle BYREF variants in CFolderItems::Item.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=faae7e57902dba58da03b… commit faae7e57902dba58da03b4158025761a71eef3f3 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Sep 8 11:10:29 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Sep 22 11:41:57 2019 +0200 [SHELL32] Handle BYREF variants in CFolderItems::Item. Fixes crash in shell32_winetest:shelldispatch. See also: https://source.winehq.org/git/wine.git/commitdiff/6634b31520d56efb7f9b81513… --- dll/win32/shell32/CFolderItems.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dll/win32/shell32/CFolderItems.cpp b/dll/win32/shell32/CFolderItems.cpp index 9d2e27090bb..5952120c80f 100644 --- a/dll/win32/shell32/CFolderItems.cpp +++ b/dll/win32/shell32/CFolderItems.cpp @@ -247,11 +247,18 @@ HRESULT STDMETHODCALLTYPE CFolderItems::get_Parent(IDispatch **ppid) return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CFolderItems::Item(VARIANT index, FolderItem **ppid) +HRESULT STDMETHODCALLTYPE CFolderItems::Item(VARIANT var, FolderItem **ppid) { + CComVariant index; + HRESULT hr; + if (!m_EnumIDList) return E_FAIL; + hr = VariantCopyInd(&index, &var); + if (FAILED(hr)) + return hr; + if (V_VT(&index) == VT_I2) VariantChangeType(&index, &index, 0, VT_I4); @@ -259,7 +266,7 @@ HRESULT STDMETHODCALLTYPE CFolderItems::Item(VARIANT index, FolderItem **ppid) { ULONG count = V_UI4(&index); - HRESULT hr = m_EnumIDList->Reset(); + hr = m_EnumIDList->Reset(); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -282,7 +289,7 @@ HRESULT STDMETHODCALLTYPE CFolderItems::Item(VARIANT index, FolderItem **ppid) if (!V_BSTR(&index)) return S_FALSE; - HRESULT hr = m_Folder->ParseName(V_BSTR(&index), ppid); + hr = m_Folder->ParseName(V_BSTR(&index), ppid); if (FAILED_UNEXPECTEDLY(hr)) return hr; return hr;

5 years, 3 months

[reactos] 01/05: [WS2_32_APITEST] Try to make the number of WSAAsync tests constant.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06e886086cbc504e7a3d0… commit 06e886086cbc504e7a3d0ed7bb2d28d90d0aee37 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Sep 8 08:44:09 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Sep 22 11:41:40 2019 +0200 [WS2_32_APITEST] Try to make the number of WSAAsync tests constant. --- modules/rostests/apitests/ws2_32/WSAAsync.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/rostests/apitests/ws2_32/WSAAsync.c b/modules/rostests/apitests/ws2_32/WSAAsync.c index 13db2219ea1..95c1d670bb0 100644 --- a/modules/rostests/apitests/ws2_32/WSAAsync.c +++ b/modules/rostests/apitests/ws2_32/WSAAsync.c @@ -121,11 +121,10 @@ START_TEST(WSAAsync) { dwWait = WaitForMultipleObjects(2, fEvents, FALSE, WAIT_TIMEOUT_); - ok(dwWait == WAIT_OBJECT_0 || // server socket event - dwWait == WAIT_OBJECT_0+1, // client socket event - "Unknown event received %ld\n", dwWait); - if (dwWait != WAIT_OBJECT_0 && dwWait != WAIT_OBJECT_0+1) + if (dwWait != WAIT_OBJECT_0 && // server socket event + dwWait != WAIT_OBJECT_0+1) // client socket event { + ok(0, "Unknown event received %ld\n", dwWait); skip("ERROR: Connection timeout\n"); break; } @@ -227,9 +226,12 @@ START_TEST(WSAAsync) } else { - ok(nSockNameRes == 0, "ERROR: getsockname function failed, expected %d error %d\n", 0, nSockNameRes); - ok(len == sizeof(addr_con_loc), "ERROR: getsockname function wrong size, expected %d returned %d\n", sizeof(addr_con_loc), len); - ok(addr_con_loc.sin_addr.s_addr == server_addr_in.sin_addr.s_addr, "ERROR: getsockname function wrong addr, expected %lx returned %lx\n", server_addr_in.sin_addr.s_addr, addr_con_loc.sin_addr.s_addr); + if (nSockNameRes != 0) + ok(0, "ERROR: getsockname function failed, expected %d error %d\n", 0, nSockNameRes); + if (len != sizeof(addr_con_loc)) + ok(0, "ERROR: getsockname function wrong size, expected %d returned %d\n", sizeof(addr_con_loc), len); + if (addr_con_loc.sin_addr.s_addr != server_addr_in.sin_addr.s_addr) + ok(0, "ERROR: getsockname function wrong addr, expected %lx returned %lx\n", server_addr_in.sin_addr.s_addr, addr_con_loc.sin_addr.s_addr); } if ((dwFlags & FD_ACCEPT) != 0) {// client connected

5 years, 3 months

[reactos] 01/01: [MOUNTMGR] HasDriveLetter(): Simplify code by using a for() loop

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=085528c31ad8b91ae7af6… commit 085528c31ad8b91ae7af6dda9b9faa5c463ade70 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun Sep 22 10:25:09 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Sep 22 10:25:09 2019 +0200 [MOUNTMGR] HasDriveLetter(): Simplify code by using a for() loop --- drivers/filters/mountmgr/device.c | 4 ++-- drivers/filters/mountmgr/mountmgr.c | 24 +++++++----------------- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/drivers/filters/mountmgr/device.c b/drivers/filters/mountmgr/device.c index ce8f58ce855..8ed81e327d0 100644 --- a/drivers/filters/mountmgr/device.c +++ b/drivers/filters/mountmgr/device.c @@ -506,13 +506,13 @@ MountMgrNextDriveLetterWorker(IN PDEVICE_EXTENSION DeviceExtension, DeviceInformation->LetterAssigned = DriveLetterInfo->DriveLetterWasAssigned = TRUE; - /* Browse all the symlink to see if there's already a drive letter */ + /* Browse all the symlinks to check if there is already a drive letter */ NextEntry = DeviceInformation->SymbolicLinksListHead.Flink; while (NextEntry != &(DeviceInformation->SymbolicLinksListHead)) { SymlinkInformation = CONTAINING_RECORD(NextEntry, SYMLINK_INFORMATION, SymbolicLinksListEntry); - /* This is a driver letter & online one, forget about new drive eltter */ + /* If this is a drive letter and it is online, forget about new drive letter */ if (IsDriveLetter(&(SymlinkInformation->Name)) && SymlinkInformation->Online) { DriveLetterInfo->DriveLetterWasAssigned = FALSE; diff --git a/drivers/filters/mountmgr/mountmgr.c b/drivers/filters/mountmgr/mountmgr.c index c2fc801a478..37c85874c97 100644 --- a/drivers/filters/mountmgr/mountmgr.c +++ b/drivers/filters/mountmgr/mountmgr.c @@ -89,28 +89,18 @@ HasDriveLetter(IN PDEVICE_INFORMATION DeviceInformation) PLIST_ENTRY NextEntry; PSYMLINK_INFORMATION SymlinkInfo; - /* To have a drive letter, a device must have symbolic links */ - if (IsListEmpty(&(DeviceInformation->SymbolicLinksListHead))) - { - return FALSE; - } - - /* Browse all the links untill a drive letter is found */ - NextEntry = &(DeviceInformation->SymbolicLinksListHead); - do + /* Browse all the symlinks to check if there is at least a drive letter */ + for (NextEntry = DeviceInformation->SymbolicLinksListHead.Flink; + NextEntry != &DeviceInformation->SymbolicLinksListHead; + NextEntry = NextEntry->Flink) { SymlinkInfo = CONTAINING_RECORD(NextEntry, SYMLINK_INFORMATION, SymbolicLinksListEntry); - if (SymlinkInfo->Online) + if (IsDriveLetter(&SymlinkInfo->Name) && SymlinkInfo->Online) { - if (IsDriveLetter(&(SymlinkInfo->Name))) - { - return TRUE; - } + return TRUE; } - - NextEntry = NextEntry->Flink; - } while (NextEntry != &(DeviceInformation->SymbolicLinksListHead)); + } return FALSE; }

5 years, 3 months

[reactos] 01/01: [PSDK] Add missing declaration of WTSGetActiveConsoleSessionId() (#1920)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b6654c0fb5b5077160e44… commit b6654c0fb5b5077160e445ea95bbb9ce99003d49 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sat Sep 21 18:51:28 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 21 18:51:28 2019 +0200 [PSDK] Add missing declaration of WTSGetActiveConsoleSessionId() (#1920) This allows this function to be used. --- sdk/include/psdk/winbase.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/include/psdk/winbase.h b/sdk/include/psdk/winbase.h index 5f2c867ac2a..a1adf48268c 100644 --- a/sdk/include/psdk/winbase.h +++ b/sdk/include/psdk/winbase.h @@ -3283,8 +3283,11 @@ BOOL WINAPI WriteProfileSectionW(_In_ LPCWSTR, _In_ LPCWSTR); BOOL WINAPI WriteProfileStringA(_In_opt_ LPCSTR, _In_opt_ LPCSTR, _In_opt_ LPCSTR); BOOL WINAPI WriteProfileStringW(_In_opt_ LPCWSTR, _In_opt_ LPCWSTR, _In_opt_ LPCWSTR); DWORD WINAPI WriteTapemark(_In_ HANDLE, _In_ DWORD, _In_ DWORD, _In_ BOOL); + #define Yield() + #if (_WIN32_WINNT >= 0x0501) +DWORD WINAPI WTSGetActiveConsoleSessionId(VOID); BOOL WINAPI ZombifyActCtx(_Inout_ HANDLE); #endif

5 years, 3 months

[reactos] 01/01: [CODEOWNERS] Add some entries, fix some others Also delete a now obsolete comment

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89761ef951da933051e8a… commit 89761ef951da933051e8a1a9081a4a5d1af72bf2 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Sep 21 17:40:51 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Sep 21 17:40:51 2019 +0200 [CODEOWNERS] Add some entries, fix some others Also delete a now obsolete comment --- CODEOWNERS | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 852cba37869..ea5916ff9e9 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -60,8 +60,6 @@ ## Maintained: Someone is handling that area ## Upstream: This is 3rd party code, synced in our tree ## Abandoned: No one is handling that code anymore -## F: Files. Directories, files (wildcards allowed) covered in -## this area ## C: Comments @@ -106,6 +104,7 @@ /dll/appcompat/ @learn-more /dll/shellext/acppage/ @learn-more /ntoskrnl/ps/apphelp.c @learn-more +/sdk/tools/xml2sdb/ @learn-more # Cache Manager # M: HeisSpiter, Pierre Schweitzer @@ -147,13 +146,13 @@ # Freeloader # M: -# R: tkreuzer. ThePhysicist, Timo Kreuzer +# R: tkreuzer, ThePhysicist, Timo Kreuzer # R: Extravert-ir, extravert34, Victor Perevertkin # S: Maintained /boot/freeldr/freeldr/ @tkreuzer @Extravert-ir # HAL / APIC -# M: tkreuzer. ThePhysicist, Timo Kreuzer +# M: tkreuzer, ThePhysicist, Timo Kreuzer # S: Maintained /hal/halx86/apic/ @tkreuzer @@ -167,7 +166,7 @@ # M: # R: HeisSpiter, Pierre Schweitzer # R: ThFabba, Thomas Faber -# R: tkreuzer. ThePhysicist, Timo Kreuzer +# R: tkreuzer, ThePhysicist, Timo Kreuzer # S: Maintained /ntoskrnl/ @HeisSpiter @ThFabba @tkreuzer @@ -202,7 +201,7 @@ # R: HeisSpiter, Pierre Schweitzer # R: learn-more, learn_more, Mark Jansen # R: ThFabba, Thomas Faber -# R: tkreuzer. ThePhysicist, Timo Kreuzer +# R: tkreuzer, ThePhysicist, Timo Kreuzer # S: Maintained /dll/ntdll/ @HeisSpiter @learn-more @ThFabba @tkreuzer @@ -228,7 +227,7 @@ # R: HeisSpiter, Pierre Schweitzer # R: learn-more, learn_more, Mark Jansen # R: ThFabba, Thomas Faber -# R: tkreuzer. ThePhysicist, Timo Kreuzer +# R: tkreuzer, ThePhysicist, Timo Kreuzer # S: Maintained /sdk/lib/rtl/ @HeisSpiter @learn-more @ThFabba @tkreuzer @@ -306,10 +305,11 @@ /sdk/lib/3rdparty/zlib/ @ThFabba # x64 related code (keep this at the bottom) -# M: tkreuzer. ThePhysicist, Timo Kreuzer +# M: tkreuzer, ThePhysicist, Timo Kreuzer # S: Maintained amd64/ @tkreuzer /boot/freeldr/freeldr/arch/realmode/amd64.S @tkreuzer # Translations de-DE.rc @reactos/lang-german +nl-NL.rc @reactos/lang-dutch

5 years, 3 months

[reactos] 01/01: [USETUP] Improve Japanese translation (#1918)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=92443b44442fb51b35c91… commit 92443b44442fb51b35c917a5225e0b492b340795 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 21 23:07:07 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 21 23:07:07 2019 +0900 [USETUP] Improve Japanese translation (#1918) --- base/setup/usetup/lang/ja-JP.h | 166 ++++++++++++++++++++--------------------- 1 file changed, 83 insertions(+), 83 deletions(-) diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index 35e2584e691..0bf9ac39153 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -14,19 +14,19 @@ static MUI_ENTRY jaJPSetupInitPageEntries[] = { 0, 20, - "Please wait while the ReactOS Setup initializes itself", + "ReactOS \276\257\304\261\257\314\337 \311 \274\256\267\266 \304 \303\336\312\336\262\275 \311 \271\335\274\255\302", TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER }, { 0, 21, - "and discovers your devices...", + "\246 \265\317\301 \270\300\336\273\262...", TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER }, { 0, 0, - "Please wait...", + "\265\317\301 \270\300\336\273\262...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, }, { @@ -112,7 +112,7 @@ static MUI_ENTRY jaJPWelcomePageEntries[] = { 8, 15, - "\x07 Press ENTER to install or upgrade ReactOS.", + "\x07 ReactOS \246 \262\335\275\304\260\331 / \261\257\314\337\270\336\332\260\304\336 \275\331 \306\312 ENTER \246 \265\274\303 \270\300\336\273\262\241", TEXT_STYLE_NORMAL }, { @@ -170,55 +170,55 @@ static MUI_ENTRY jaJPIntroPageEntries[] = { 6, 8, - "ReactOS Version Status", + "ReactOS \311 \312\336\260\274\336\256\335 \274\336\256\263\300\262", TEXT_STYLE_HIGHLIGHT }, { 6, 11, - "ReactOS is in Alpha stage, meaning it is not feature-complete", + "ReactOS \312 \261\331\314\247 \300\336\335\266\262 \306 \261\330\244 \267\311\263 \266\336 \320\266\335\276\262 \303\336", TEXT_STYLE_NORMAL }, { 6, 12, - "and is under heavy development. It is recommended to use it only for", + "\266\262\312\302 \301\255\263 \303\336\275\241 \274\300\266\336\257\303 \313\256\263\266 \317\300\312 \303\275\304 \323\270\303\267 \303\336 \311\320 \274\326\263", TEXT_STYLE_NORMAL }, { 6, 13, - "evaluation and testing purposes and not as your daily-usage OS.", + "\275\331 \272\304 \246 \265\275\275\322 \274\317\275\241 \306\301\274\336\256\263 \303\267 \305 \274\326\263 \306\312 \265\275\275\322 \303\336\267\317\276\335\241", TEXT_STYLE_NORMAL }, { 6, 15, - "Backup your data or test on a secondary computer if you attempt", + "\274\336\257\273\262 \311 \312\260\304\336\263\252\261 \303\336 \300\322\275 \312\336\261\262 \312 \303\336\260\300 \246 \312\336\257\270\261\257\314\337 \275\331 \266", TEXT_STYLE_NORMAL }, { 6, 16, - "to run ReactOS on real hardware.", + "\326\313\336 \311 \312\337\277\272\335 \303\336 \274\326\263 \274\303 \270\300\336\273\262\241", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Press ENTER to continue ReactOS Setup.", + "\x07 ENTER \246 \265\275\304 \277\336\257\272\263 \274\317\275\241", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Press F3 to quit without installing ReactOS.", + "\x07 F3 \246 \265\275 \304 ReactOS \246 \262\335\275\304\260\331 \276\275\336\306 \274\255\263\330\256\263 \274\317\275\241", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER = Continue F3 = Quit", + "ENTER = \277\336\257\272\263 F3 = \274\255\263\330\256\263", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -521,55 +521,55 @@ static MUI_ENTRY jaJPUpgradePageEntries[] = { 6, 8, - "The ReactOS Setup can upgrade one of the available ReactOS installations", + "ReactOS \276\257\304\261\257\314\337 \312 \274\300 \306 \332\257\267\256 \273\332\300 \262\335\275\304\260\331 \311 \262\275\336\332\266 \266\336 \266\311\263 \303\336\275\241", TEXT_STYLE_NORMAL }, { 6, 9, - "listed below, or, if a ReactOS installation is damaged, the Setup program", + "\323\274\270\312\244 \323\274 ReactOS \311 \262\335\275\304\260\331 \266\336 \277\335\274\256\263 \274\303 \262\332\312\336 \276\257\304\261\257\314\337 \314\337\333\270\336\327\321 \312", TEXT_STYLE_NORMAL }, { 6, 10, - "can attempt to repair it.", + "\274\255\263\314\270 \246 \272\272\333\320\331 \272\304 \266\336 \303\336\267\317\275\241", TEXT_STYLE_NORMAL }, { 6, 12, - "The repair functions are not all implemented yet.", + "\274\255\263\314\270 \267\311\263 \312 \317\300\336 \266\335\276\336\335 \306\312 \274\336\257\277\263 \273\332\303 \262\317\276\335\241", TEXT_STYLE_HIGHLIGHT }, { 8, 15, - "\x07 Press UP or DOWN to select an OS installation.", + "\x07 UP \317\300\312 DOWN \246 \265\276\312\336 OS \311 \262\335\275\304\260\331 \246 \276\335\300\270 \303\336\267\317\275\241", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Press U for upgrading the selected OS installation.", + "\x07 U \246 \265\276\312\336 \276\335\300\270 \274\300 \262\335\275\304\260\331 \246 \261\257\314\337\270\336\332\260\304\336 \303\336\267\317\275\241", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Press ESC to continue with a new installation.", + "\x07 ESC \246 \265\276\312\336 \261\300\327\274\262 \262\335\275\304\260\331 \303\336 \277\336\257\272\263 \274\317\275\241", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Press F3 to quit without installing ReactOS.", + "\x07 F3 \246 \265\276\312\336 ReactOS \246 \262\335\275\304\260\331 \276\275\336\306 \274\255\263\330\256\263 \274\317\275\241", TEXT_STYLE_NORMAL }, { 0, 0, - "U = Upgrade ESC = Do not upgrade F3 = Quit", + "U = \261\257\314\337\270\336\332\260\304\336 ESC = \261\257\314\337\270\336\332\260\304\336 \274\305\262 F3 = \274\255\263\330\256\263", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -898,20 +898,20 @@ static MUI_ENTRY jaJPSelectPartitionEntries[] = { 8, 15, - "\x07 Press P to create a primary partition.", + "\x07 P \246 \265\276\312\336 \314\337\327\262\317\330\260 \312\337\260\303\250\274\256\335 \246 \273\270\276\262 \274\317\275\241", // "\x07 ��׼� �߰è�� C �� ޻��", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Press E to create an extended partition.", + "\x07 E \246 \265\276\312\336 \266\270\301\256\263 \312\337\260\303\250\274\256\335 \246 \273\270\276\262 \274\317\275\241", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Press L to create a logical partition.", + "\x07 L \246 \265\276\312\336 \333\335\330 \312\337\260\303\250\274\256\335 \246 \273\270\276\262 \274\317\275\241", TEXT_STYLE_NORMAL }, { @@ -939,97 +939,97 @@ static MUI_ENTRY jaJPChangeSystemPartition[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "The current system partition of your computer", + "\274\275\303\321 \303\336\250\275\270 \306 \261\331 \261\305\300 \311 \312\337\277\272\335 \311 \271\336\335\273\336\262 \311 \274\275\303\321", TEXT_STYLE_NORMAL }, { 6, 12, - "on the system disk", + "\312\337\260\303\250\274\256\335 \312 ReactOS \303\336 \273\316\337\260\304 \273\332\303 \262\305\262 \271\262\274\267 \246", TEXT_STYLE_NORMAL }, { 6, 16, - "uses a format not supported by ReactOS.", + "\302\266\257\303 \262\317\275\241", TEXT_STYLE_NORMAL }, { 6, 18, - "In order to successfully install ReactOS, the Setup program must change", + "ReactOS \246 \314\336\274\336\306 \276\262\272\263 \273\276\331 \300\322 \306\312\244 \276\257\304\261\257\314\337 \314\337\333\270\336\327\321 \312", TEXT_STYLE_NORMAL }, { 6, 19, - "the current system partition to a new one.", + "\271\336\335\273\336\262 \311 \274\275\303\321 \312\337\260\303\250\274\256\335 \246 \261\300\327\274\262 \323\311 \306 \266\264\305\262\304 \262\271\317\276\335\241", TEXT_STYLE_NORMAL }, { 6, 21, - "The new candidate system partition is:", + "\261\300\327\274\262 \274\275\303\321 \312\337\260\303\250\274\256\335 \311 \272\263\316 \312:", TEXT_STYLE_NORMAL }, { 8, 25, - "\x07 To accept this choice, press ENTER.", + "\x07 \272\311 \276\335\300\270 \246 \263\271\262\332\331 \305\327 ENTER \246 \265\274\303 \270\300\336\273\262\241", TEXT_STYLE_NORMAL }, { 8, 27, - "\x07 To manually change the system partition, press ESC to go back to", + "\x07 \274\275\303\321 \312\337\260\303\250\274\256\335 \246 \274\255\304\336\263 \303\336 \315\335\272\263 \275\331 \305\327\244 ESC \246 \265\274\303", TEXT_STYLE_NORMAL }, { 8, 28, - " the partition selection list, then select or create a new system", + " \312\337\260\303\250\274\256\335 \276\335\300\270 \330\275\304 \306 \323\304\336\330\244 \261\300\327\274\262 \274\275\303\321 \312\337\260\303\250\274\256\335 \246", TEXT_STYLE_NORMAL }, { 8, 29, - " partition on the system disk.", + " \276\335\300\270 \275\331\266 \273\270\276\262 \274\303 \270\300\336\273\262\241", TEXT_STYLE_NORMAL }, { 6, 32, - "In case there are other operating systems that depend on the original", + "\323\274 \323\304\311 \274\275\303\321 \312\337\260\303\250\274\256\335 \306 \262\277\336\335\275\331 \316\266\311 OS \266\336 \261\332\312\336\244", TEXT_STYLE_NORMAL }, { 6, 33, - "system partition, you may need to either reconfigure them for the new", + "ReactOS \262\335\275\304\260\331 \311 \261\304 \306 \261\300\327\274\262 \274\275\303\321 \312\337\260\303\250\274\256\335 \306", TEXT_STYLE_NORMAL }, { 6, 34, - "system partition, or you may need to change the system partition back", + "\273\262\276\257\303\262 \275\331\266\244 \274\275\303\321 \312\337\260\303\250\274\256\335 \246 \323\304 \306 \323\304\336\275 \313\302\326\263 \266\336 ", TEXT_STYLE_NORMAL }, { 6, 35, - "to the original one after finishing the installation of ReactOS.", + "\261\331 \266\323 \274\332\317\276\335\241", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER = Continue ESC = Cancel", + "ENTER = \277\336\257\272\263 ESC = \267\254\335\276\331", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1051,79 +1051,79 @@ static MUI_ENTRY jaJPConfirmDeleteSystemPartitionEntries[] = { 6, 8, - "You have chosen to delete the system partition.", + "\274\275\303\321 \312\337\260\303\250\274\256\335 \311 \273\270\274\336\256 \202\252 \264\327\312\336\332 \317\274\300\241", TEXT_STYLE_NORMAL }, { 6, 10, - "System partitions can contain diagnostic programs, hardware configuration", + "\274\275\303\321 \312\337\260\303\250\274\256\335 \202\315 \274\335\300\336\335 \314\337\333\270\336\327\321\244 \312\260\304\336\263\252\261 \276\257\303\262 \314\337\333\270\336\327\321\244 ReactOS", TEXT_STYLE_NORMAL }, { 6, 11, - "programs, programs to start an operating system (like ReactOS) or other", + "\305\304\336 \311 OS \324\244\312\260\304\336\263\252\261 \266\262\312\302\323\304 \266\336 \303\262\267\256\263 \275\331 \316\266\311 \314\337\333\270\336\327\321 \246 \266\262\274 \275\331", TEXT_STYLE_NORMAL }, { 6, 12, - "programs provided by the hardware manufacturer.", + "\314\337\333\270\336\327\321 \246 \314\270\321 \272\304 \266\336 \261\330\317\275\241", TEXT_STYLE_NORMAL }, { 6, 14, - "Delete a system partition only when you are sure that there are no such", + "\277\311\326\263\305 \314\337\333\270\336\327\321 \266\336 \305\262 \266 \266\270\306\335 \274\300 \266\244 \273\270\274\336\256 \274\303 \323 \262\262\304\267 \311\320", TEXT_STYLE_NORMAL }, { 6, 15, - "programs on the partition, or when you are sure you want to delete them.", + "\273\270\274\336\256 \274\303 \270\300\336\273\262\241", TEXT_STYLE_NORMAL }, { 6, 16, - "When you delete the partition, you might not be able to boot the", + "\312\337\260\303\250\274\256\335 \246 \273\270\274\336\256 \274\300 \304\267\244 ReactOS \276\257\304\261\257\314\337 \266\336 \274\255\263\330\256\263 \275\331\317\303\336\244", TEXT_STYLE_NORMAL }, { 6, 17, - "computer from the harddisk until you finished the ReactOS Setup.", + "\312\260\304\336\303\336\250\275\270 \266\327 \277\311 \272\335\313\337\255\260\300 \246 \267\304\336\263 \303\336\267\305\262 \266\323 \274\332\317\276\335\241", TEXT_STYLE_NORMAL }, { 8, 20, - "\x07 Press ENTER to delete the system partition. You will be asked", + "\x07 ENTER \246 \265\276\312\336 \274\275\303\321 \312\337\260\303\250\274\256\335 \246 \273\270\274\336\256 \274\317\275\241 \266\270\306\335 \311 \300\322\244", TEXT_STYLE_NORMAL }, { 8, 21, - " to confirm the deletion of the partition again later.", + " \261\304\303\336 \323\263\262\301\304\336 \300\275\336\310\317\275\241", TEXT_STYLE_NORMAL }, { 8, 24, - "\x07 Press ESC to return to the previous page. The partition will", + "\x07 ESC \246 \265\276\312\336 \317\264 \311 \315\337\260\274\336 \315 \323\304\336\330\317\275\241 \312\337\260\303\250\274\256\335 \312", TEXT_STYLE_NORMAL }, { 8, 25, - " not be deleted.", + " \273\270\274\336\256 \273\332\317\276\335\241", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER=Continue ESC=Cancel", + "ENTER=\277\336\257\272\263 ESC=\267\254\335\276\331", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1571,7 +1571,7 @@ MUI_ERROR jaJPErrorEntries[] = { { // NOT_AN_ERROR - "Success\n" + "\276\262\272\263\n" }, { // ERROR_NOT_INSTALLED @@ -1585,18 +1585,18 @@ MUI_ERROR jaJPErrorEntries[] = }, { // ERROR_NO_BUILD_PATH - "Failed to build the installation paths for the ReactOS installation directory!\n" - "ENTER = Reboot computer" + "ReactOS \262\335\275\304\260\331 \303\336\250\332\270\304\330 \311 \262\335\275\304\260\331 \273\267 \311 \312\337\275 \246 \272\263\301\270 \275\331 \311\306 \274\257\312\337\262 \274\317\274\300!\n" + "ENTER = \273\262\267\304\336\263" }, { // ERROR_SOURCE_PATH - "You cannot delete the partition containing the installation source!\n" - "ENTER = Reboot computer" + "\262\335\275\304\260\331 \323\304 \246 \314\270\321 \312\337\260\303\250\274\256\335 \246 \273\270\274\336\256 \303\336\267\317\276\335!\n" + "ENTER = \273\262\267\304\336\263" }, { // ERROR_SOURCE_DIR - "You cannot install ReactOS within the installation source directory!\n" - "ENTER = Reboot computer" + "\262\335\275\304\260\331 \323\304 \305\262\314\336 \306 ReactOS \246 \262\335\275\304\260\331 \303\336\267\317\276\335!\n" + "ENTER = \273\262\267\304\336\263" }, { // ERROR_NO_HDD @@ -1788,37 +1788,37 @@ MUI_ERROR jaJPErrorEntries[] = }, { // ERROR_DIRECTORY_NAME, - "Invalid directory name.\n" + "\314\276\262 \305 \303\336\250\332\270\304\330 \322\262 \303\336\275\241\n" "\n" - " * Press any key to continue." + " * \277\336\257\272\263 \275\331 \306\312 \305\306\266 \267\260 \246 \265\274\303 \270\300\336\273\262\241" }, { // ERROR_INSUFFICIENT_PARTITION_SIZE, - "The selected partition is not large enough to install ReactOS.\n" - "The install partition must have a size of at least %lu MB.\n" + "\276\335\300\270 \274\300 \312\337\260\303\250\274\256\335 \312\244 ReactOS \311 \262\335\275\304\260\331 \306\312\244 \301\262\273 \275\267\336 \317\275\241\n" + "\262\335\275\304\260\331 \273\267 \311 \312\337\260\303\250\274\256\335 \312 \275\270\305\270\304\323 %lu MB \313\302\326\263 \303\336\275\241\n" "\n" - " * Press any key to continue.", + " * \277\336\257\272\263 \275\331 \306\312 \305\306\266 \267\260 \246 \265\274\303 \270\300\336\273\262\241", NULL }, { // ERROR_PARTITION_TABLE_FULL, - "You cannot create a new primary or extended partition in the\n" - "partition table of this disk because the partition table is full.\n" + "\312\337\260\303\250\274\256\335 \303\260\314\336\331 \266\336 \262\257\312\337\262 \305\311\303\336\244 \272\311 \303\336\250\275\270 \306\n" + "\261\300\327\274\262 \314\337\327\262\317\330\260 \317\300\312 \266\270\301\256\263 \312\337\260\303\250\274\256\335 \246 \273\270\276\262 \303\336\267\317\276\335\241\n" "\n" - " * Press any key to continue." + " * \277\336\257\272\263 \275\331 \306\312 \305\306\266 \267\260 \246 \265\274\303 \270\300\336\273\262\241" }, { // ERROR_ONLY_ONE_EXTENDED, - "You cannot create more than one extended partition per disk.\n" + "\313\304\302 \311 \303\336\250\275\270 \306 \262\257\272\262\274\336\256\263 \311 \266\270\301\256\263 \312\337\260\303\250\274\256\335 \246 \273\270\276\262 \303\336\267\317\276\335\241\n" "\n" - " * Press any key to continue." + " * \277\336\257\272\263 \275\331 \306\312 \305\306\266 \267\260 \246 \265\274\303 \270\300\336\273\262\241" }, { // ERROR_FORMATTING_PARTITION, - "Setup is unable to format the partition:\n" + "\276\257\304\261\257\314\337 \312 \272\311 \312\337\260\303\250\274\256\335 \246 \314\253\260\317\257\304 \303\336\267\317\276\335:\n" " %S\n" "\n" - "ENTER = Reboot computer" + "ENTER = \272\335\313\337\255\260\300 \311 \273\262\267\304\336\263" }, { NULL, @@ -1958,12 +1958,12 @@ MUI_STRING jaJPStrings[] = {STRING_PARTITIONSIZE, "\261\300\327\274\262 \312\337\260\303\250\274\256\335\311 \273\262\275\336:"}, {STRING_CHOOSENEWPARTITION, - "You have chosen to create a primary partition on"}, + "\314\337\327\262\317\330\260 \312\337\260\303\250\274\256\335 \311 \273\270\276\262 \246 \264\327\313\336 \317\274\300"}, // "��׼� �߰è��ݦ ·�� Ķ� �� ϼ�:"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, - "You have chosen to create an extended partition on"}, + "\266\270\301\256\263 \312\337\260\303\250\274\256\335 \311 \273\270\276\262 \246 \264\327\313\336 \317\274\300"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, - "You have chosen to create a logical partition on"}, + "\333\335\330 \312\337\260\303\250\274\256\335 \311 \273\270\276\262 \246 \264\327\313\336 \317\274\300"}, {STRING_HDDSIZE, "\261\300\327\274\262 \312\337\260\303\250\274\256\335\311 \273\262\275\336\246 \322\266\336\312\336\262\304 \300\335\262\303\336 \306\255\263\330\256\270 \274\303\270\300\336\273\262\241"}, {STRING_CREATEPARTITION, @@ -1973,9 +1973,9 @@ MUI_STRING jaJPStrings[] = {STRING_NONFORMATTEDPART, "ReactOS\246 \274\335\267 \317\300\312 \320\314\253\260\317\257\304\311 \312\337\260\303\250\274\256\335\306 \262\335\275\304\260\331\275\331 \272\304\266\336 \276\335\300\270 \273\332\317\274\300\241"}, {STRING_NONFORMATTEDSYSTEMPART, - "The system partition is not formatted yet."}, + "\274\275\303\321 \312\337\260\303\250\274\256\335 \312 \317\300\336 \314\253\260\317\257\304 \273\332\303 \262\317\276\335\241"}, {STRING_NONFORMATTEDOTHERPART, - "The new partition is not formatted yet."}, + "\261\300\327\274\262 \312\337\260\303\250\274\256\335 \312 \317\300\336 \314\253\260\317\257\304 \273\332\303 \262\317\276\335\241"}, {STRING_INSTALLONPART, "\276\257\304\261\257\314\337\312 ReactOS\246 \312\337\260\303\250\274\256\335 \274\336\256\263\306 \262\335\275\304\260\331\274\317\275\241"}, {STRING_CHECKINGPART, @@ -1987,11 +1987,11 @@ MUI_STRING jaJPStrings[] = {STRING_REBOOTCOMPUTER, "ENTER = \272\335\313\337\255\260\300\311 \273\262\267\304\336\263"}, {STRING_DELETING, - " Deleting file: %S"}, + " \314\247\262\331 \311 \273\270\274\336\256: %S"}, {STRING_MOVING, - " Moving file: %S to: %S"}, + " \314\247\262\331 \311 \262\304\336\263: %S \266\327: %S"}, {STRING_RENAMING, - " Renaming file: %S to: %S"}, + " \305\317\264 \311 \315\335\272\263: %S to: %S"}, {STRING_COPYING, " \272\313\337\260 \301\255\263\311 \314\247\262\331: %S"}, {STRING_SETUPCOPYINGFILES, @@ -2013,7 +2013,7 @@ MUI_STRING jaJPStrings[] = {STRING_REBOOTCOMPUTER2, " ENTER = \272\335\313\337\255\260\300\311 \273\262\267\304\336\263"}, {STRING_REBOOTPROGRESSBAR, - " Your computer will reboot in %li second(s)... "}, + " %li \313\336\256\263\272\336 \306 \273\262\267\304\336\263 \273\332\317\275... "}, {STRING_CONSOLEFAIL1, "\272\335\277\260\331\246 \265\260\314\337\335 \303\336\267\317\276\335\r\n\r\n"}, {STRING_CONSOLEFAIL2, @@ -2059,7 +2059,7 @@ MUI_STRING jaJPStrings[] = {STRING_MAXSIZE, "MB (\273\262\300\336\262. %lu MB)"}, {STRING_EXTENDED_PARTITION, - "Extended Partition"}, + "\266\270\301\256\263 \312\337\260\303\250\274\256\335"}, {STRING_UNFORMATTED, "\274\335\267 (\320\314\253\260\317\257\304)"}, {STRING_FORMATUNUSED,

5 years, 3 months

[reactos] 01/01: [OPENGLCFG] Fix crash if no drivers (#1919)

by Carlo Bramini

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e7b8f273094c9402ff1df… commit e7b8f273094c9402ff1df3baa5841bf3518a3f02 Author: Carlo Bramini <30959007+carlo-bramini(a)users.noreply.github.com> AuthorDate: Sat Sep 21 15:58:38 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 21 15:58:38 2019 +0200 [OPENGLCFG] Fix crash if no drivers (#1919) Actually, it crashes here on Windows XP. --- dll/cpl/openglcfg/general.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dll/cpl/openglcfg/general.c b/dll/cpl/openglcfg/general.c index f9376ed0b8c..69170a4232f 100644 --- a/dll/cpl/openglcfg/general.c +++ b/dll/cpl/openglcfg/general.c @@ -190,13 +190,14 @@ INT_PTR CALLBACK GeneralPageProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM break; case WM_DESTROY: - { + if (pOglDrivers != NULL) + { INT iKey; for (iKey = 0; iKey <= dwNumDrivers; iKey++) HeapFree(GetProcessHeap(), 0, pOglDrivers[iKey]); HeapFree(GetProcessHeap(), 0, pOglDrivers); - } + } } return FALSE;

5 years, 3 months

[reactos] 01/01: [User32|Tests] Sync Port Wine Combo Controls.

by James Tabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c57d4d7b9e76959795b0a… commit c57d4d7b9e76959795b0abc66b2be5b7f46d3d3c Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Sat Sep 21 08:47:56 2019 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Sat Sep 21 08:47:56 2019 -0500 [User32|Tests] Sync Port Wine Combo Controls. Need to cross check these changes with WINE ComCtl32 before you PANIC HACK!!!! Not in order: Piotr Caban : Remove unneeded RECT parameter from CBPaintText helper. Don't invalidate ComboBox on CB_SETCURSEL message. Don't invalidate ComboBox on LBN_SELCHANGE and LBN_SELCANCEL. Add more CB_SETCURSEL tests on ComboBox. Redraw combo text field even if it's empty. Let ComboBox edit control handle the redraw even if CBF_NOREDRAW is set. Don't do the painting if combobox is not visible in CBPaintText. Dmitry Timoshkov : Don't force a combobox repaint on WM_SIZE. This breaks z-order based painting and causes side effects for applications that during the WM_PAINT processing reference internal data associated with a not fully initialized window. Ref : https://source.winehq.org/git/wine.git/commit/2d9e3236ea8ae752184b8a285f9d6… Fabian Maurer : Set listbox popup height correctly and add tests. Properly set dropdown height. Now that user32 and comctl32 combo are separated, this won't lead to a regression anymore Ref : https://source.winehq.org/git/wine.git/commit/3d0be0bad8eca72e67199ebfb4511… Info by Sebastian Lackner Ref: https://source.winehq.org/git/wine.git/commit/f0fc0349976924379cc3ae2ff95fb… Nikolay Sivov : Remove some misleading TODOs and confusing comments. --- modules/rostests/winetests/user32/combo.c | 24 ++--- win32ss/user/user32/controls/combo.c | 163 ++++++++++++++---------------- 2 files changed, 86 insertions(+), 101 deletions(-) diff --git a/modules/rostests/winetests/user32/combo.c b/modules/rostests/winetests/user32/combo.c index ad706ea7540..0d3b1b170f5 100644 --- a/modules/rostests/winetests/user32/combo.c +++ b/modules/rostests/winetests/user32/combo.c @@ -291,7 +291,7 @@ static void test_WM_LBUTTONDOWN(void) hCombo = CreateWindowA("ComboBox", "Combo", WS_VISIBLE|WS_CHILD|CBS_DROPDOWN, 0, 0, 200, 150, hMainWnd, (HMENU)COMBO_ID, NULL, 0); - for (i = 0; i < sizeof(choices)/sizeof(UINT); i++){ + for (i = 0; i < ARRAY_SIZE(choices); i++){ sprintf(buffer, stringFormat, choices[i]); result = SendMessageA(hCombo, CB_ADDSTRING, 0, (LPARAM)buffer); ok(result == i, @@ -688,28 +688,28 @@ static void test_listbox_size(DWORD style) int height_combo; BOOL todo; } info_height[] = { - {2, 24, TRUE}, + {2, 24, FALSE}, {2, 41, TRUE}, - {2, 42, TRUE}, - {2, 50, TRUE}, + {2, 42, FALSE}, + {2, 50, FALSE}, {2, 60}, {2, 80}, {2, 89}, {2, 90}, {2, 100}, - {10, 24, TRUE}, + {10, 24, FALSE}, {10, 41, TRUE}, - {10, 42, TRUE}, - {10, 50, TRUE}, - {10, 60, TRUE}, - {10, 80, TRUE}, + {10, 42, FALSE}, + {10, 50, FALSE}, + {10, 60, FALSE}, + {10, 80, FALSE}, {10, 89, TRUE}, - {10, 90, TRUE}, - {10, 100, TRUE}, + {10, 90, FALSE}, + {10, 100, FALSE}, }; - for(test = 0; test < sizeof(info_height) / sizeof(info_height[0]); test++) + for(test = 0; test < ARRAY_SIZE(info_height); test++) { const struct list_size_info *info_test = &info_height[test]; int height_item; /* Height of a list item */ diff --git a/win32ss/user/user32/controls/combo.c b/win32ss/user/user32/controls/combo.c index 11537901e5f..da453ec08a9 100644 --- a/win32ss/user/user32/controls/combo.c +++ b/win32ss/user/user32/controls/combo.c @@ -17,18 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * - * NOTES - * - * This code was audited for completeness against the documented features - * of Comctl32.dll version 6.0 on Oct. 4, 2004, by Dimitrie O. Paun. - * - * Unless otherwise noted, we believe this code to be complete, as per - * the specification mentioned above. - * If you discover missing features, or bugs, please note them below. - * * TODO: - * - ComboBox_[GS]etMinVisible() - * - CB_GETMINVISIBLE, CB_SETMINVISIBLE * - CB_SETTOPINDEX */ @@ -651,6 +640,58 @@ static void CBPaintButton( LPHEADCOMBO lphc, HDC hdc, RECT rectButton) DrawFrameControl(hdc, &rectButton, DFC_SCROLL, buttonState); } +/*********************************************************************** + * COMBO_PrepareColors + * + * This method will sent the appropriate WM_CTLCOLOR message to + * prepare and setup the colors for the combo's DC. + * + * It also returns the brush to use for the background. + */ +static HBRUSH COMBO_PrepareColors( + LPHEADCOMBO lphc, + HDC hDC) +{ + HBRUSH hBkgBrush; + + /* + * Get the background brush for this control. + */ + if (CB_DISABLED(lphc)) + { +#ifdef __REACTOS__ + hBkgBrush = GetControlColor(lphc->owner, lphc->self, hDC, WM_CTLCOLORSTATIC); +#else + hBkgBrush = (HBRUSH)SendMessageW(lphc->owner, WM_CTLCOLORSTATIC, + (WPARAM)hDC, (LPARAM)lphc->self ); +#endif + /* + * We have to change the text color since WM_CTLCOLORSTATIC will + * set it to the "enabled" color. This is the same behavior as the + * edit control + */ + SetTextColor(hDC, GetSysColor(COLOR_GRAYTEXT)); + } + else + { + /* FIXME: In which cases WM_CTLCOLORLISTBOX should be sent? */ +#ifdef __REACTOS__ + hBkgBrush = GetControlColor(lphc->owner, lphc->self, hDC, WM_CTLCOLOREDIT); +#else + hBkgBrush = (HBRUSH)SendMessageW(lphc->owner, WM_CTLCOLOREDIT, + (WPARAM)hDC, (LPARAM)lphc->self ); +#endif + } + + /* + * Catch errors. + */ + if( !hBkgBrush ) + hBkgBrush = GetSysColorBrush(COLOR_WINDOW); + + return hBkgBrush; +} + /*********************************************************************** * CBPaintText * @@ -658,14 +699,12 @@ static void CBPaintButton( LPHEADCOMBO lphc, HDC hdc, RECT rectButton) */ static void CBPaintText( LPHEADCOMBO lphc, - HDC hdc, - RECT rectEdit) + HDC hdc_paint) { + RECT rectEdit = lphc->textRect; INT id, size = 0; LPWSTR pText = NULL; - if( lphc->wState & CBF_NOREDRAW ) return; - TRACE("\n"); /* follow Windows combobox that sends a bunch of text @@ -683,27 +722,31 @@ static void CBPaintText( pText[size] = '\0'; /* just in case */ } else return; } - else - if( !CB_OWNERDRAWN(lphc) ) - return; if( lphc->wState & CBF_EDIT ) { static const WCHAR empty_stringW[] = { 0 }; if( CB_HASSTRINGS(lphc) ) SetWindowTextW( lphc->hWndEdit, pText ? pText : empty_stringW ); if( lphc->wState & CBF_FOCUSED ) - SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, (LPARAM)(-1)); + SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, MAXLONG); } - else /* paint text field ourselves */ + else if(!(lphc->wState & CBF_NOREDRAW) && IsWindowVisible( lphc->self )) { - UINT itemState = ODS_COMBOBOXEDIT; - HFONT hPrevFont = (lphc->hFont) ? SelectObject(hdc, lphc->hFont) : 0; + /* paint text field ourselves */ + HDC hdc = hdc_paint ? hdc_paint : GetDC(lphc->self); + UINT itemState = ODS_COMBOBOXEDIT; + HFONT hPrevFont = (lphc->hFont) ? SelectObject(hdc, lphc->hFont) : 0; + HBRUSH hPrevBrush, hBkgBrush; /* * Give ourselves some space. */ InflateRect( &rectEdit, -1, -1 ); + hBkgBrush = COMBO_PrepareColors( lphc, hdc ); + hPrevBrush = SelectObject( hdc, hBkgBrush ); + FillRect( hdc, &rectEdit, hBkgBrush ); + if( CB_OWNERDRAWN(lphc) ) { DRAWITEMSTRUCT dis; @@ -769,6 +812,12 @@ static void CBPaintText( if( hPrevFont ) SelectObject(hdc, hPrevFont ); + + if( hPrevBrush ) + SelectObject( hdc, hPrevBrush ); + + if( !hdc_paint ) + ReleaseDC( lphc->self, hdc ); } #ifdef __REACTOS__ if (pText) @@ -801,59 +850,6 @@ static void CBPaintBorder( DrawEdge(hdc, &clientRect, EDGE_SUNKEN, BF_RECT); } -/*********************************************************************** - * COMBO_PrepareColors - * - * This method will sent the appropriate WM_CTLCOLOR message to - * prepare and setup the colors for the combo's DC. - * - * It also returns the brush to use for the background. - */ -static HBRUSH COMBO_PrepareColors( - LPHEADCOMBO lphc, - HDC hDC) -{ - HBRUSH hBkgBrush; - - /* - * Get the background brush for this control. - */ - if (CB_DISABLED(lphc)) - { -#ifdef __REACTOS__ - hBkgBrush = GetControlColor(lphc->owner, lphc->self, hDC, WM_CTLCOLORSTATIC); -#else - hBkgBrush = (HBRUSH)SendMessageW(lphc->owner, WM_CTLCOLORSTATIC, - (WPARAM)hDC, (LPARAM)lphc->self ); -#endif - /* - * We have to change the text color since WM_CTLCOLORSTATIC will - * set it to the "enabled" color. This is the same behavior as the - * edit control - */ - SetTextColor(hDC, GetSysColor(COLOR_GRAYTEXT)); - } - else - { - /* FIXME: In which cases WM_CTLCOLORLISTBOX should be sent? */ -#ifdef __REACTOS__ - hBkgBrush = GetControlColor(lphc->owner, lphc->self, hDC, WM_CTLCOLOREDIT); -#else - hBkgBrush = (HBRUSH)SendMessageW(lphc->owner, WM_CTLCOLOREDIT, - (WPARAM)hDC, (LPARAM)lphc->self ); -#endif - } - - /* - * Catch errors. - */ - if( !hBkgBrush ) - hBkgBrush = GetSysColorBrush(COLOR_WINDOW); - - return hBkgBrush; -} - - /*********************************************************************** * COMBO_Paint */ @@ -902,7 +898,7 @@ static LRESULT COMBO_Paint(LPHEADCOMBO lphc, HDC hParamDC) } if( !(lphc->wState & CBF_EDIT) ) - CBPaintText( lphc, hDC, lphc->textRect); + CBPaintText( lphc, hDC ); if( hPrevBrush ) SelectObject( hDC, hPrevBrush ); @@ -1055,14 +1051,6 @@ static void CBDropDown( LPHEADCOMBO lphc ) if (nHeight < nDroppedHeight - COMBO_YBORDERSIZE()) nDroppedHeight = nHeight + COMBO_YBORDERSIZE(); - - if (nDroppedHeight < nHeight) - { - if (nItems < 5) - nDroppedHeight = (nItems+1)*nIHeight; - else if (nDroppedHeight < 6*nIHeight) - nDroppedHeight = 6*nIHeight; - } } r.left = rect.left; @@ -1580,7 +1568,7 @@ static void COMBO_Size( LPHEADCOMBO lphc ) &lphc->buttonRect, &lphc->droppedRect); - CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); + CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, FALSE ); } @@ -2203,10 +2191,7 @@ LRESULT WINAPI ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPAR SendMessageW(lphc->hWndLBox, LB_SETTOPINDEX, wParam, 0); /* no LBN_SELCHANGE in this case, update manually */ - if( lphc->wState & CBF_EDIT ) - CBUpdateEdit( lphc, (INT)wParam ); - else - InvalidateRect(lphc->self, &lphc->textRect, TRUE); + CBPaintText( lphc, NULL ); lphc->wState &= ~CBF_SELCHANGE; return lParam; case CB_GETLBTEXT:

5 years, 3 months

← Newer
1
2
3
4
5
6
7
8
...
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2019