Ros-diffs February 2016

ros-diffs@reactos.org

10 participants
155 discussions

[pschweitzer] 70754: [MPR] Import Wine commit (by Nikolay Sivov): - 164fe0470ccf7cb3c0946cbb52d4139aec0c4a03, Query for NPAddConnection and NPAddConnection3 when loading a provider. CORE-10032
by pschweitzer＠svn.reactos.org 15 Feb '16

15 Feb '16

Author: pschweitzer Date: Mon Feb 15 20:15:54 2016 New Revision: 70754 URL: http://svn.reactos.org/svn/reactos?rev=70754&view=rev Log: [MPR] Import Wine commit (by Nikolay Sivov): - 164fe0470ccf7cb3c0946cbb52d4139aec0c4a03, Query for NPAddConnection and NPAddConnection3 when loading a provider. CORE-10032 Modified: trunk/reactos/dll/win32/mpr/mpr_ros.diff trunk/reactos/dll/win32/mpr/wnet.c Modified: trunk/reactos/dll/win32/mpr/mpr_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_ros.diff… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_ros.diff [iso-8859-1] Mon Feb 15 20:15:54 2016 @@ -3,237 +3,237 @@ --- mpr.spec (revision 49877) +++ mpr.spec (working copy) @@ -1,23 +1,23 @@ - # ordinal exports -- 1 stub @ -- 2 stub @ -- 3 stub @ -- 4 stub @ -- 5 stub @ -- 6 stub @ -- 7 stub @ -- 8 stub @ -- 9 stub @ --12 stub @ --13 stub @ --14 stub @ --15 stub @ --16 stub @ --17 stub @ --18 stub @ --19 stub @ --20 stub @ --21 stub @ -+ 1 stub MPR_1 -+ 2 stub MPR_2 -+ 3 stub MPR_3 -+ 4 stub MPR_4 -+ 5 stub MPR_5 -+ 6 stub MPR_6 -+ 7 stub MPR_7 -+ 8 stub MPR_8 -+ 9 stub MPR_9 -+12 stub MPR_12 -+13 stub MPR_13 -+14 stub MPR_14 -+15 stub MPR_15 -+16 stub MPR_16 -+17 stub MPR_17 -+18 stub MPR_18 -+19 stub MPR_19 -+20 stub MPR_20 -+21 stub MPR_21 - 22 stdcall @(long) MPR_Alloc - 23 stdcall @(ptr long) MPR_ReAlloc - 24 stdcall @(ptr) MPR_Free -Index: wnet.c -=================================================================== ---- wnet.c (rÃ©vision 70645) -+++ wnet.c (copie de travail) -@@ -1549,6 +1549,33 @@ - dwFlags, NULL, 0, NULL); - } - -+/* Convert an ANSI string to wide */ -+static LPWSTR strdupAtoW( LPCSTR str ) -+{ -+ LPWSTR ret; -+ INT len; -+ -+ if (!str) return NULL; -+ len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); -+ ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); -+ if (ret) MultiByteToWideChar( CP_ACP, 0, str, -1, ret, len ); -+ return ret; -+} -+ -+/* Convert ANSI NETRESOURCE struct to wide structure */ -+static VOID convert_netresourcea_to_w( LPNETRESOURCEA lpNetResourceA, -+ LPNETRESOURCEW lpNetResourceW ) -+{ -+ lpNetResourceW->dwScope = lpNetResourceA->dwScope; -+ lpNetResourceW->dwType = lpNetResourceA->dwType; -+ lpNetResourceW->dwDisplayType = lpNetResourceA->dwDisplayType; -+ lpNetResourceW->dwUsage = lpNetResourceA->dwUsage; -+ lpNetResourceW->lpLocalName = strdupAtoW(lpNetResourceA->lpLocalName); -+ lpNetResourceW->lpRemoteName = strdupAtoW(lpNetResourceA->lpRemoteName); -+ lpNetResourceW->lpComment = strdupAtoW(lpNetResourceA->lpComment); -+ lpNetResourceW->lpProvider = strdupAtoW(lpNetResourceA->lpProvider); -+} -+ - /***************************************************************** - * WNetUseConnectionA [MPR.@] - */ -@@ -1557,12 +1584,67 @@ - LPSTR lpAccessName, LPDWORD lpBufferSize, - LPDWORD lpResult ) - { -- FIXME( "(%p, %p, %p, %s, 0x%08X, %s, %p, %p), stub\n", -- hwndOwner, lpNetResource, lpPassword, debugstr_a(lpUserID), dwFlags, -- debugstr_a(lpAccessName), lpBufferSize, lpResult ); -+ NETRESOURCEW resourcesW, *pRes = NULL; -+ PWSTR passW, userIDW, accessNameW = NULL; -+ DWORD ret = WN_MORE_DATA; -+ DWORD bufferSize = 1; -+ int len; - -- SetLastError(WN_NO_NETWORK); -- return WN_NO_NETWORK; -+ if (lpNetResource) -+ { -+ convert_netresourcea_to_w(lpNetResource, &resourcesW); -+ pRes = &resourcesW; -+ } -+ -+ passW = strdupAtoW(lpPassword); -+ userIDW = strdupAtoW(lpUserID); -+ -+ if (lpAccessName && lpBufferSize && *lpBufferSize) -+ { -+ WCHAR probe; -+ -+ ret = WNetUseConnectionW(hwndOwner, pRes, passW, userIDW, dwFlags, -+ &probe, &bufferSize, lpResult); -+ if (ret == WN_MORE_DATA) -+ accessNameW = HeapAlloc(GetProcessHeap(), 0, bufferSize * sizeof(WCHAR)); -+ } -+ -+ if (ret == WN_MORE_DATA) -+ { -+ ret = WNetUseConnectionW(hwndOwner, pRes, passW, userIDW, dwFlags, -+ accessNameW, &bufferSize, lpResult); -+ if (ret == WN_SUCCESS) -+ { -+ if (lpAccessName && lpBufferSize && *lpBufferSize && accessNameW) -+ { -+ len = WideCharToMultiByte(CP_ACP, 0, accessNameW, -1, NULL, 0, NULL, NULL); -+ if (len) -+ { -+ if (len <= *lpBufferSize) -+ WideCharToMultiByte(CP_ACP, 0, accessNameW, -1, lpAccessName, len, NULL, NULL); -+ else -+ { -+ WNetCancelConnectionW(accessNameW, TRUE); -+ *lpBufferSize = len; -+ ret = WN_MORE_DATA; -+ } -+ } -+ } -+ } -+ } -+ -+ if (lpNetResource) -+ { -+ HeapFree(GetProcessHeap(), 0, resourcesW.lpLocalName); -+ HeapFree(GetProcessHeap(), 0, resourcesW.lpRemoteName); -+ HeapFree(GetProcessHeap(), 0, resourcesW.lpComment); -+ HeapFree(GetProcessHeap(), 0, resourcesW.lpProvider); -+ } -+ HeapFree(GetProcessHeap(), 0, passW); -+ HeapFree(GetProcessHeap(), 0, userIDW); -+ HeapFree(GetProcessHeap(), 0, accessNameW); -+ -+ return ret; - } - - /***************************************************************** -@@ -1573,12 +1655,75 @@ - LPWSTR lpAccessName, LPDWORD lpBufferSize, - LPDWORD lpResult ) - { -- FIXME( "(%p, %p, %p, %s, 0x%08X, %s, %p, %p), stub\n", -- hwndOwner, lpNetResource, lpPassword, debugstr_w(lpUserID), dwFlags, -- debugstr_w(lpAccessName), lpBufferSize, lpResult ); -+ DWORD provider; -+ DWORD cap; -+ char id; -+ DWORD drives; -+ DWORD ret; -+ PF_NPAddConnection3 addConn3; -+ PF_NPAddConnection addConn; - -- SetLastError(WN_NO_NETWORK); -- return WN_NO_NETWORK; -+ if (!providerTable || providerTable->numProviders == 0) { -+ SetLastError(WN_NO_NETWORK); -+ return WN_NO_NETWORK; -+ } -+ -+ if (!lpNetResource) { -+ SetLastError(ERROR_INVALID_PARAMETER); -+ return ERROR_INVALID_PARAMETER; -+ } -+ -+ if (!lpNetResource->lpProvider || !*lpNetResource->lpProvider) { -+ SetLastError(ERROR_BAD_PROVIDER); -+ return ERROR_BAD_PROVIDER; -+ } -+ -+ if (!lpNetResource->lpLocalName || !*lpNetResource->lpLocalName) { -+ SetLastError(ERROR_BAD_DEVICE); -+ return ERROR_BAD_DEVICE; -+ } -+ -+ if ((!(lpNetResource->lpLocalName[0] >= 'a' && lpNetResource->lpLocalName[0] <= 'z') && -+ !(lpNetResource->lpLocalName[0] >= 'A' && lpNetResource->lpLocalName[0] <= 'Z')) || -+ lpNetResource->lpLocalName[1] != ':' || lpNetResource->lpLocalName[2]) { -+ SetLastError(ERROR_BAD_DEVICE); -+ return ERROR_BAD_DEVICE; -+ } -+ -+ id = (lpNetResource->lpLocalName[0] >= 'a') ? lpNetResource->lpLocalName[0] - 'a' : lpNetResource->lpLocalName[0] - 'A'; -+ drives = GetLogicalDrives(); -+ if (drives & (1 << id)) { -+ SetLastError(ERROR_ALREADY_ASSIGNED); -+ return ERROR_ALREADY_ASSIGNED; -+ } -+ -+ provider = _findProviderIndexW(lpNetResource->lpProvider); -+ if (provider == BAD_PROVIDER_INDEX) { -+ SetLastError(ERROR_BAD_PROVIDER); -+ return ERROR_BAD_PROVIDER; -+ } -+ -+ cap = providerTable->table[provider].getCaps(WNNC_CONNECTION); -+ if (!(cap & WNNC_CON_ADDCONNECTION) && !(cap & WNNC_CON_ADDCONNECTION3)) { -+ SetLastError(ERROR_BAD_PROVIDER); -+ return ERROR_BAD_PROVIDER; -+ } -+ -+ ret = WN_ACCESS_DENIED; -+ if (cap & WNNC_CON_ADDCONNECTION3) { -+ addConn3 = (PF_NPAddConnection3)GetProcAddress(providerTable->table[provider].hLib, "NPAddConnection3"); -+ if (addConn3) { -+ ret = addConn3(hwndOwner, lpNetResource, (LPWSTR)lpPassword, (LPWSTR)lpUserID, dwFlags); -+ } -+ } -+ else if (cap & WNNC_CON_ADDCONNECTION) { -+ addConn = (PF_NPAddConnection)GetProcAddress(providerTable->table[provider].hLib, "NPAddConnection"); -+ if (addConn) { -+ ret = addConn(lpNetResource, (LPWSTR)lpPassword, (LPWSTR)lpUserID); -+ } -+ } -+ -+ return ret; - } - - /********************************************************************* + # ordinal exports +- 1 stub @ +- 2 stub @ +- 3 stub @ +- 4 stub @ +- 5 stub @ +- 6 stub @ +- 7 stub @ +- 8 stub @ +- 9 stub @ +-12 stub @ +-13 stub @ +-14 stub @ +-15 stub @ +-16 stub @ +-17 stub @ +-18 stub @ +-19 stub @ +-20 stub @ +-21 stub @ ++ 1 stub MPR_1 ++ 2 stub MPR_2 ++ 3 stub MPR_3 ++ 4 stub MPR_4 ++ 5 stub MPR_5 ++ 6 stub MPR_6 ++ 7 stub MPR_7 ++ 8 stub MPR_8 ++ 9 stub MPR_9 ++12 stub MPR_12 ++13 stub MPR_13 ++14 stub MPR_14 ++15 stub MPR_15 ++16 stub MPR_16 ++17 stub MPR_17 ++18 stub MPR_18 ++19 stub MPR_19 ++20 stub MPR_20 ++21 stub MPR_21 + 22 stdcall @(long) MPR_Alloc + 23 stdcall @(ptr long) MPR_ReAlloc + 24 stdcall @(ptr) MPR_Free +Index: wnet.c +=================================================================== +--- wnet.c (rÃ©vision 70645) ++++ wnet.c (copie de travail) +@@ -1553,6 +1553,33 @@ + dwFlags, NULL, 0, NULL); + } + ++/* Convert an ANSI string to wide */ ++static LPWSTR strdupAtoW( LPCSTR str ) ++{ ++ LPWSTR ret; ++ INT len; ++ ++ if (!str) return NULL; ++ len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); ++ ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); ++ if (ret) MultiByteToWideChar( CP_ACP, 0, str, -1, ret, len ); ++ return ret; ++} ++ ++/* Convert ANSI NETRESOURCE struct to wide structure */ ++static VOID convert_netresourcea_to_w( LPNETRESOURCEA lpNetResourceA, ++ LPNETRESOURCEW lpNetResourceW ) ++{ ++ lpNetResourceW->dwScope = lpNetResourceA->dwScope; ++ lpNetResourceW->dwType = lpNetResourceA->dwType; ++ lpNetResourceW->dwDisplayType = lpNetResourceA->dwDisplayType; ++ lpNetResourceW->dwUsage = lpNetResourceA->dwUsage; ++ lpNetResourceW->lpLocalName = strdupAtoW(lpNetResourceA->lpLocalName); ++ lpNetResourceW->lpRemoteName = strdupAtoW(lpNetResourceA->lpRemoteName); ++ lpNetResourceW->lpComment = strdupAtoW(lpNetResourceA->lpComment); ++ lpNetResourceW->lpProvider = strdupAtoW(lpNetResourceA->lpProvider); ++} ++ + /***************************************************************** + * WNetUseConnectionA [MPR.@] + */ +@@ -1561,12 +1588,67 @@ + LPSTR lpAccessName, LPDWORD lpBufferSize, + LPDWORD lpResult ) + { +- FIXME( "(%p, %p, %p, %s, 0x%08X, %s, %p, %p), stub\n", +- hwndOwner, lpNetResource, lpPassword, debugstr_a(lpUserID), dwFlags, +- debugstr_a(lpAccessName), lpBufferSize, lpResult ); ++ NETRESOURCEW resourcesW, *pRes = NULL; ++ PWSTR passW, userIDW, accessNameW = NULL; ++ DWORD ret = WN_MORE_DATA; ++ DWORD bufferSize = 1; ++ int len; + +- SetLastError(WN_NO_NETWORK); +- return WN_NO_NETWORK; ++ if (lpNetResource) ++ { ++ convert_netresourcea_to_w(lpNetResource, &resourcesW); ++ pRes = &resourcesW; ++ } ++ ++ passW = strdupAtoW(lpPassword); ++ userIDW = strdupAtoW(lpUserID); ++ ++ if (lpAccessName && lpBufferSize && *lpBufferSize) ++ { ++ WCHAR probe; ++ ++ ret = WNetUseConnectionW(hwndOwner, pRes, passW, userIDW, dwFlags, ++ &probe, &bufferSize, lpResult); ++ if (ret == WN_MORE_DATA) ++ accessNameW = HeapAlloc(GetProcessHeap(), 0, bufferSize * sizeof(WCHAR)); ++ } ++ ++ if (ret == WN_MORE_DATA) ++ { ++ ret = WNetUseConnectionW(hwndOwner, pRes, passW, userIDW, dwFlags, ++ accessNameW, &bufferSize, lpResult); ++ if (ret == WN_SUCCESS) ++ { ++ if (lpAccessName && lpBufferSize && *lpBufferSize && accessNameW) ++ { ++ len = WideCharToMultiByte(CP_ACP, 0, accessNameW, -1, NULL, 0, NULL, NULL); ++ if (len) ++ { ++ if (len <= *lpBufferSize) ++ WideCharToMultiByte(CP_ACP, 0, accessNameW, -1, lpAccessName, len, NULL, NULL); ++ else ++ { ++ WNetCancelConnectionW(accessNameW, TRUE); ++ *lpBufferSize = len; ++ ret = WN_MORE_DATA; ++ } ++ } ++ } ++ } ++ } ++ ++ if (lpNetResource) ++ { ++ HeapFree(GetProcessHeap(), 0, resourcesW.lpLocalName); ++ HeapFree(GetProcessHeap(), 0, resourcesW.lpRemoteName); ++ HeapFree(GetProcessHeap(), 0, resourcesW.lpComment); ++ HeapFree(GetProcessHeap(), 0, resourcesW.lpProvider); ++ } ++ HeapFree(GetProcessHeap(), 0, passW); ++ HeapFree(GetProcessHeap(), 0, userIDW); ++ HeapFree(GetProcessHeap(), 0, accessNameW); ++ ++ return ret; + } + + /***************************************************************** +@@ -1577,12 +1659,75 @@ + LPWSTR lpAccessName, LPDWORD lpBufferSize, + LPDWORD lpResult ) + { +- FIXME( "(%p, %p, %p, %s, 0x%08X, %s, %p, %p), stub\n", +- hwndOwner, lpNetResource, lpPassword, debugstr_w(lpUserID), dwFlags, +- debugstr_w(lpAccessName), lpBufferSize, lpResult ); ++ DWORD provider; ++ DWORD cap; ++ char id; ++ DWORD drives; ++ DWORD ret; ++ PF_NPAddConnection3 addConn3; ++ PF_NPAddConnection addConn; + +- SetLastError(WN_NO_NETWORK); +- return WN_NO_NETWORK; ++ if (!providerTable || providerTable->numProviders == 0) { ++ SetLastError(WN_NO_NETWORK); ++ return WN_NO_NETWORK; ++ } ++ ++ if (!lpNetResource) { ++ SetLastError(ERROR_INVALID_PARAMETER); ++ return ERROR_INVALID_PARAMETER; ++ } ++ ++ if (!lpNetResource->lpProvider || !*lpNetResource->lpProvider) { ++ SetLastError(ERROR_BAD_PROVIDER); ++ return ERROR_BAD_PROVIDER; ++ } ++ ++ if (!lpNetResource->lpLocalName || !*lpNetResource->lpLocalName) { ++ SetLastError(ERROR_BAD_DEVICE); ++ return ERROR_BAD_DEVICE; ++ } ++ ++ if ((!(lpNetResource->lpLocalName[0] >= 'a' && lpNetResource->lpLocalName[0] <= 'z') && ++ !(lpNetResource->lpLocalName[0] >= 'A' && lpNetResource->lpLocalName[0] <= 'Z')) || ++ lpNetResource->lpLocalName[1] != ':' || lpNetResource->lpLocalName[2]) { ++ SetLastError(ERROR_BAD_DEVICE); ++ return ERROR_BAD_DEVICE; ++ } ++ ++ id = (lpNetResource->lpLocalName[0] >= 'a') ? lpNetResource->lpLocalName[0] - 'a' : lpNetResource->lpLocalName[0] - 'A'; ++ drives = GetLogicalDrives(); ++ if (drives & (1 << id)) { ++ SetLastError(ERROR_ALREADY_ASSIGNED); ++ return ERROR_ALREADY_ASSIGNED; ++ } ++ ++ provider = _findProviderIndexW(lpNetResource->lpProvider); ++ if (provider == BAD_PROVIDER_INDEX) { ++ SetLastError(ERROR_BAD_PROVIDER); ++ return ERROR_BAD_PROVIDER; ++ } ++ ++ cap = providerTable->table[provider].getCaps(WNNC_CONNECTION); ++ if (!(cap & WNNC_CON_ADDCONNECTION) && !(cap & WNNC_CON_ADDCONNECTION3)) { ++ SetLastError(ERROR_BAD_PROVIDER); ++ return ERROR_BAD_PROVIDER; ++ } ++ ++ ret = WN_ACCESS_DENIED; ++ if (cap & WNNC_CON_ADDCONNECTION3) { ++ addConn3 = (PF_NPAddConnection3)GetProcAddress(providerTable->table[provider].hLib, "NPAddConnection3"); ++ if (addConn3) { ++ ret = addConn3(hwndOwner, lpNetResource, (LPWSTR)lpPassword, (LPWSTR)lpUserID, dwFlags); ++ } ++ } ++ else if (cap & WNNC_CON_ADDCONNECTION) { ++ addConn = (PF_NPAddConnection)GetProcAddress(providerTable->table[provider].hLib, "NPAddConnection"); ++ if (addConn) { ++ ret = addConn(lpNetResource, (LPWSTR)lpPassword, (LPWSTR)lpUserID); ++ } ++ } ++ ++ return ret; + } + + /********************************************************************* Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=7… ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Mon Feb 15 20:15:54 2016 @@ -46,6 +46,8 @@ PF_NPEnumResource enumResource; PF_NPCloseEnum closeEnum; PF_NPGetResourceInformation getResourceInformation; + PF_NPAddConnection addConnection; + PF_NPAddConnection3 addConnection3; } WNetProvider, *PWNetProvider; typedef struct _WNetProviderTable @@ -152,8 +154,9 @@ if (hLib) { - PF_NPGetCaps getCaps = (PF_NPGetCaps)GetProcAddress(hLib, - "NPGetCaps"); +#define MPR_GETPROC(proc) ((PF_##proc)GetProcAddress(hLib, #proc)) + + PF_NPGetCaps getCaps = MPR_GETPROC(NPGetCaps); TRACE("loaded lib %p\n", hLib); if (getCaps) @@ -172,22 +175,17 @@ if (provider->dwEnumScopes) { TRACE("supports enumeration\n"); - provider->openEnum = (PF_NPOpenEnum) - GetProcAddress(hLib, "NPOpenEnum"); - TRACE("openEnum is %p\n", provider->openEnum); - provider->enumResource = (PF_NPEnumResource) - GetProcAddress(hLib, "NPEnumResource"); - TRACE("enumResource is %p\n", - provider->enumResource); - provider->closeEnum = (PF_NPCloseEnum) - GetProcAddress(hLib, "NPCloseEnum"); - TRACE("closeEnum is %p\n", provider->closeEnum); - provider->getResourceInformation = (PF_NPGetResourceInformation) - GetProcAddress(hLib, "NPGetResourceInformation"); - TRACE("getResourceInformation is %p\n", - provider->getResourceInformation); - if (!provider->openEnum || !provider->enumResource - || !provider->closeEnum) + provider->openEnum = MPR_GETPROC(NPOpenEnum); + TRACE("NPOpenEnum %p\n", provider->openEnum); + provider->enumResource = MPR_GETPROC(NPEnumResource); + TRACE("NPEnumResource %p\n", provider->enumResource); + provider->closeEnum = MPR_GETPROC(NPCloseEnum); + TRACE("NPCloseEnum %p\n", provider->closeEnum); + provider->getResourceInformation = MPR_GETPROC(NPGetResourceInformation); + TRACE("NPGetResourceInformation %p\n", provider->getResourceInformation); + if (!provider->openEnum || + !provider->enumResource || + !provider->closeEnum) { provider->openEnum = NULL; provider->enumResource = NULL; @@ -196,6 +194,10 @@ WARN("Couldn't load enumeration functions\n"); } } + provider->addConnection = MPR_GETPROC(NPAddConnection); + provider->addConnection3 = MPR_GETPROC(NPAddConnection3); + TRACE("NPAddConnection %p\n", provider->addConnection); + TRACE("NPAddConnection3 %p\n", provider->addConnection3); providerTable->numProviders++; } else @@ -205,6 +207,8 @@ HeapFree(GetProcessHeap(), 0, name); FreeLibrary(hLib); } + +#undef MPR_GETPROC } else {

1 0

[jimtabor] 70753: [User32] - Update usage comments related to CORE-10855.
by jimtabor＠svn.reactos.org 15 Feb '16

15 Feb '16

Author: jimtabor Date: Mon Feb 15 17:38:23 2016 New Revision: 70753 URL: http://svn.reactos.org/svn/reactos?rev=70753&view=rev Log: [User32] - Update usage comments related to CORE-10855. Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] Mon Feb 15 17:38:23 2016 @@ -300,7 +300,7 @@ } /* WARNING: Redundant with /ntuser/defwnd.c!UserPaintCaption !! - Use TWOPARAM_ROUTINE_REDRAWTITLE or HWNDLOCK_ROUTINE_REDRAWFRAMEANDHOOK . + Use TWOPARAM_ROUTINE_REDRAWTITLE/REDRAWFRAME or HWNDLOCK_ROUTINE_REDRAWFRAMEANDHOOK . */ static void UserPaintCaption(PWND pwnd, INT Flags)

1 0

[jimtabor] 70752: [User32] - Update usage comments related to CORE-10855.
by jimtabor＠svn.reactos.org 15 Feb '16

15 Feb '16

Author: jimtabor Date: Mon Feb 15 17:34:17 2016 New Revision: 70752 URL: http://svn.reactos.org/svn/reactos?rev=70752&view=rev Log: [User32] - Update usage comments related to CORE-10855. Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] Mon Feb 15 17:34:17 2016 @@ -299,7 +299,9 @@ return TRUE; } -/* WARNING: Redundant with /ntuser/defwnd.c!UserPaintCaption !! */ +/* WARNING: Redundant with /ntuser/defwnd.c!UserPaintCaption !! + Use TWOPARAM_ROUTINE_REDRAWTITLE or HWNDLOCK_ROUTINE_REDRAWFRAMEANDHOOK . + */ static void UserPaintCaption(PWND pwnd, INT Flags) {

1 0

[hbelusca] 70751: [USER32][NTUSER] Remove some dead code; fix comments; mention that some code is redundant. This is added to help future people in cleaning up that mess called "win32k/user32".
by hbelusca＠svn.reactos.org 15 Feb '16

15 Feb '16

Author: hbelusca Date: Mon Feb 15 01:20:54 2016 New Revision: 70751 URL: http://svn.reactos.org/svn/reactos?rev=70751&view=rev Log: [USER32][NTUSER] Remove some dead code; fix comments; mention that some code is redundant. This is added to help future people in cleaning up that mess called "win32k/user32". Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/user32/windows/defwnd.c trunk/reactos/win32ss/user/user32/windows/window.c Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Mon Feb 15 01:20:54 2016 @@ -404,7 +404,7 @@ /* * When themes are not enabled we can go on and paint the non client area. * However if we do that with themes enabled we will draw a classic frame. - * This is sovled by sending a themes specific message to notify the themes + * This is solved by sending a themes specific message to notify the themes * engine that the caption needs to be redrawn */ if (gpsi->dwSRVIFlags & SRVINFO_APIHOOK) Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] Mon Feb 15 01:20:54 2016 @@ -299,6 +299,7 @@ return TRUE; } +/* WARNING: Redundant with /ntuser/defwnd.c!UserPaintCaption !! */ static void UserPaintCaption(PWND pwnd, INT Flags) { @@ -309,7 +310,7 @@ /* * When themes are not enabled we can go on and paint the non client area. * However if we do that with themes enabled we will draw a classic frame. - * This is sovled by sending a themes specific message to notify the themes + * This is solved by sending a themes specific message to notify the themes * engine that the caption needs to be redrawn */ if(gpsi->dwSRVIFlags & SRVINFO_APIHOOK) Modified: trunk/reactos/win32ss/user/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/window.c [iso-8859-1] Mon Feb 15 01:20:54 2016 @@ -15,7 +15,6 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); -LRESULT DefWndNCPaint(HWND hWnd, HRGN hRgn, BOOL Active); void MDI_CalcDefaultChildPos( HWND hwndClient, INT total, LPPOINT lpPos, INT delta, UINT *id ); /* FUNCTIONS *****************************************************************/

1 0

[pschweitzer] 70750: [NTFS] Cowardly refuse to continue processing (enumerating/reading) when stumbling upon a compressed entry. This avoids infinite loops when enumerating, incorrect files content...
by pschweitzer＠svn.reactos.org 14 Feb '16

14 Feb '16

Author: pschweitzer Date: Sun Feb 14 22:44:54 2016 New Revision: 70750 URL: http://svn.reactos.org/svn/reactos?rev=70750&view=rev Log: [NTFS] Cowardly refuse to continue processing (enumerating/reading) when stumbling upon a compressed entry. This avoids infinite loops when enumerating, incorrect files contents when reading. CORE-10814 #resolve #comment 'Fixed' with r70750 Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h trunk/reactos/drivers/filesystems/ntfs/rw.c Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Sun Feb 14 22:44:54 2016 @@ -298,6 +298,13 @@ FileInformationClass = Stack->Parameters.QueryDirectory.FileInformationClass; FileIndex = Stack->Parameters.QueryDirectory.FileIndex; + if (NtfsFCBIsCompressed(Fcb)) + { + DPRINT1("Compressed directory!\n"); + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; + } + if (SearchPattern != NULL) { if (!Ccb->DirectorySearchPattern) Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Sun Feb 14 22:44:54 2016 @@ -138,6 +138,12 @@ BOOLEAN +NtfsFCBIsCompressed(PNTFS_FCB Fcb) +{ + return ((Fcb->Entry.FileAttributes & NTFS_FILE_TYPE_COMPRESSED) == NTFS_FILE_TYPE_COMPRESSED); +} + +BOOLEAN NtfsFCBIsRoot(PNTFS_FCB Fcb) { return (wcscmp(Fcb->PathName, L"\\") == 0); Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sun Feb 14 22:44:54 2016 @@ -643,6 +643,9 @@ NtfsFCBIsReparsePoint(PNTFS_FCB Fcb); BOOLEAN +NtfsFCBIsCompressed(PNTFS_FCB Fcb); + +BOOLEAN NtfsFCBIsRoot(PNTFS_FCB Fcb); VOID Modified: trunk/reactos/drivers/filesystems/ntfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] Sun Feb 14 22:44:54 2016 @@ -71,6 +71,13 @@ Fcb = (PNTFS_FCB)FileObject->FsContext; + if (NtfsFCBIsCompressed(Fcb)) + { + DPRINT1("Compressed file!\n"); + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; + } + FileRecord = ExAllocatePoolWithTag(NonPagedPool, DeviceExt->NtfsInfo.BytesPerFileRecord, TAG_NTFS); if (FileRecord == NULL) {

1 0

[hbelusca] 70749: [WINHLP32]: This is true that it's Wine help, on Wine.... but not in ReactOS!
by hbelusca＠svn.reactos.org 14 Feb '16

14 Feb '16

Author: hbelusca Date: Sun Feb 14 21:35:14 2016 New Revision: 70749 URL: http://svn.reactos.org/svn/reactos?rev=70749&view=rev Log: [WINHLP32]: This is true that it's Wine help, on Wine.... but not in ReactOS! Modified: trunk/reactos/base/applications/winhlp32/lang/Bg.rc trunk/reactos/base/applications/winhlp32/lang/Cs.rc trunk/reactos/base/applications/winhlp32/lang/Da.rc trunk/reactos/base/applications/winhlp32/lang/De.rc trunk/reactos/base/applications/winhlp32/lang/En.rc trunk/reactos/base/applications/winhlp32/lang/Es.rc trunk/reactos/base/applications/winhlp32/lang/Fi.rc trunk/reactos/base/applications/winhlp32/lang/Fr.rc trunk/reactos/base/applications/winhlp32/lang/He.rc trunk/reactos/base/applications/winhlp32/lang/Hu.rc trunk/reactos/base/applications/winhlp32/lang/It.rc trunk/reactos/base/applications/winhlp32/lang/Ja.rc trunk/reactos/base/applications/winhlp32/lang/Ko.rc trunk/reactos/base/applications/winhlp32/lang/Lt.rc trunk/reactos/base/applications/winhlp32/lang/Nl.rc trunk/reactos/base/applications/winhlp32/lang/No.rc trunk/reactos/base/applications/winhlp32/lang/Pl.rc trunk/reactos/base/applications/winhlp32/lang/Pt.rc trunk/reactos/base/applications/winhlp32/lang/Rm.rc trunk/reactos/base/applications/winhlp32/lang/Ro.rc trunk/reactos/base/applications/winhlp32/lang/Ru.rc trunk/reactos/base/applications/winhlp32/lang/Si.rc trunk/reactos/base/applications/winhlp32/lang/Sk.rc trunk/reactos/base/applications/winhlp32/lang/Sq.rc trunk/reactos/base/applications/winhlp32/lang/Sr.rc trunk/reactos/base/applications/winhlp32/lang/Sv.rc trunk/reactos/base/applications/winhlp32/lang/Tr.rc trunk/reactos/base/applications/winhlp32/lang/Uk.rc trunk/reactos/base/applications/winhlp32/lang/Zh.rc Modified: trunk/reactos/base/applications/winhlp32/lang/Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Bg.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Bg.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -72,7 +72,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine ÐÐ¾Ð¼Ð¾Ñ" +STID_WINE_HELP, "ReactOS ÐÐ¾Ð¼Ð¾Ñ" STID_WHERROR, "ÐÐ ÐÐ¨ÐÐ" STID_WARNING, "ÐÐ ÐÐÐ£ÐÐ ÐÐÐÐÐÐÐ" STID_INFO, "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ" Modified: trunk/reactos/base/applications/winhlp32/lang/Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Cs.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Cs.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -77,7 +77,7 @@ STRINGTABLE { -STID_WINE_HELP, "NÃ¡povÄda Wine" +STID_WINE_HELP, "NÃ¡povÄda ReactOS" STID_WHERROR, "CHYBA" STID_WARNING, "VAROVÃNÃ" STID_INFO, "Informace" Modified: trunk/reactos/base/applications/winhlp32/lang/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Da.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Da.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -77,7 +77,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine HjÃ¦lp" +STID_WINE_HELP, "ReactOS HjÃ¦lp" STID_WHERROR, "FEJL" STID_WARNING, "ADVARSEL" STID_INFO, "Information" Modified: trunk/reactos/base/applications/winhlp32/lang/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/De.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/De.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -75,7 +75,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine Hilfe" +STID_WINE_HELP, "ReactOS Hilfe" STID_WHERROR, "FEHLER" STID_WARNING, "ACHTUNG" STID_INFO, "Information" Modified: trunk/reactos/base/applications/winhlp32/lang/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/En.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/En.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -73,7 +73,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine Help" +STID_WINE_HELP, "ReactOS Help" STID_WHERROR, "ERROR" STID_WARNING, "WARNING" STID_INFO, "Information" Modified: trunk/reactos/base/applications/winhlp32/lang/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Es.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Es.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -75,7 +75,7 @@ STRINGTABLE { -STID_WINE_HELP, "Ayuda de Wine" +STID_WINE_HELP, "Ayuda de ReactOS" STID_WHERROR, "ERROR" STID_WARNING, "ADVERTENCIA" STID_INFO, "InformaciÃ³n" Modified: trunk/reactos/base/applications/winhlp32/lang/Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Fi.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Fi.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -74,7 +74,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine Ohje" +STID_WINE_HELP, "ReactOS Ohje" STID_WHERROR, "VIRHE" STID_WARNING, "VAROITUS" STID_INFO, "Tietoja" Modified: trunk/reactos/base/applications/winhlp32/lang/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Fr.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -77,7 +77,7 @@ STRINGTABLE { -STID_WINE_HELP, "Aide de Wine" +STID_WINE_HELP, "Aide de ReactOS" STID_WHERROR, "ERREUR" STID_WARNING, "ATTENTION" STID_INFO, "Information" Modified: trunk/reactos/base/applications/winhlp32/lang/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/He.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/He.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -76,7 +76,7 @@ STRINGTABLE { -STID_WINE_HELP, "××¢××¨× ×©× Wine" +STID_WINE_HELP, "××¢××¨× ×©× ReactOS" STID_WHERROR, "×©××××" STID_WARNING, "××××¨×" STID_INFO, "××××¢" Modified: trunk/reactos/base/applications/winhlp32/lang/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Hu.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Hu.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -74,7 +74,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine sÃºgÃ³" +STID_WINE_HELP, "ReactOS sÃºgÃ³" STID_WHERROR, "HIBA" STID_WARNING, "FIGYELMEZTETÃS" STID_INFO, "InformÃ¡ciÃ³" Modified: trunk/reactos/base/applications/winhlp32/lang/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/It.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/It.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -76,7 +76,7 @@ STRINGTABLE { -STID_WINE_HELP, "Guida di Wine" +STID_WINE_HELP, "Guida di ReactOS" STID_WHERROR, "ERRORE" STID_WARNING, "ATTENZIONE" STID_INFO, "Informazione" Modified: trunk/reactos/base/applications/winhlp32/lang/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Ja.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Ja.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -76,7 +76,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine ãã«ã" +STID_WINE_HELP, "ReactOS ãã«ã" STID_WHERROR, "ã¨ã©ã¼" STID_WARNING, "è¦å" STID_INFO, "æå ±" Modified: trunk/reactos/base/applications/winhlp32/lang/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Ko.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -75,7 +75,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine ëìë§" +STID_WINE_HELP, "ReactOS ëìë§" STID_WHERROR, "ìë¬" STID_WARNING, "ê²½ê³ " STID_INFO, "ì ë³´" Modified: trunk/reactos/base/applications/winhlp32/lang/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Lt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Lt.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -75,7 +75,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine Å¾inynas" +STID_WINE_HELP, "ReactOS Å¾inynas" STID_WHERROR, "KLAIDA" STID_WARNING, "Ä®SPÄJIMAS" STID_INFO, "Informacija" Modified: trunk/reactos/base/applications/winhlp32/lang/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Nl.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -75,7 +75,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine Help" +STID_WINE_HELP, "ReactOS Help" STID_WHERROR, "FOUT" STID_WARNING, "WAARSCHUWING" STID_INFO, "Informatie" Modified: trunk/reactos/base/applications/winhlp32/lang/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/No.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/No.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -72,7 +72,7 @@ STRINGTABLE { -STID_WINE_HELP, "Hjelp" +STID_WINE_HELP, "ReactOS Hjelp" STID_WHERROR, "FEIL" STID_WARNING, "ADVARSEL" STID_INFO, "Informasjon" Modified: trunk/reactos/base/applications/winhlp32/lang/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Pl.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -75,7 +75,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine - Pomoc" +STID_WINE_HELP, "ReactOS Pomoc" STID_WHERROR, "BÅÄD" STID_WARNING, "OSTRZEÅ»ENIE" STID_INFO, "Informacja" Modified: trunk/reactos/base/applications/winhlp32/lang/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Pt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Pt.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -81,7 +81,7 @@ STRINGTABLE { -STID_WINE_HELP, "Ajuda Wine" +STID_WINE_HELP, "Ajuda ReactOS" STID_WHERROR, "ERRO" STID_WARNING, "AVISO" STID_INFO, "InformaÃ§Ã£o" Modified: trunk/reactos/base/applications/winhlp32/lang/Rm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Rm.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Rm.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -79,7 +79,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine agï¿½d" +STID_WINE_HELP, "ReactOS agï¿½d" STID_WHERROR, "SBAGL" STID_WARNING, "ATTENZIUN" STID_INFO, "INFUORMAZIUN" Modified: trunk/reactos/base/applications/winhlp32/lang/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Ro.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Ro.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -77,7 +77,7 @@ STRINGTABLE { -STID_WINE_HELP, "Manual" +STID_WINE_HELP, "Manual ReactOS" STID_WHERROR, "EROARE" STID_WARNING, "AVERTISMENT" STID_INFO, "InformaÈie" Modified: trunk/reactos/base/applications/winhlp32/lang/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Ru.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -75,7 +75,7 @@ STRINGTABLE { -STID_WINE_HELP, "Ð¡Ð¿ÑÐ°Ð²ÐºÐ° Wine" +STID_WINE_HELP, "Ð¡Ð¿ÑÐ°Ð²ÐºÐ° ReactOS" STID_WHERROR, "ÐÐ¨ÐÐÐÐ" STID_WARNING, "ÐÐÐÐÐÐÐÐ" STID_INFO, "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ" Modified: trunk/reactos/base/applications/winhlp32/lang/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Si.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Si.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -74,7 +74,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine PomoÄ" +STID_WINE_HELP, "ReactOS PomoÄ" STID_WHERROR, "NAPAKA" STID_WARNING, "OPOZORILO" STID_INFO, "Informacija" Modified: trunk/reactos/base/applications/winhlp32/lang/Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Sk.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Sk.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -72,7 +72,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine Pomoc" +STID_WINE_HELP, "ReactOS Pomoc" STID_WHERROR, "CHYBA" STID_WARNING, "VAROVANIE" STID_INFO, "InformÃ¡cie" Modified: trunk/reactos/base/applications/winhlp32/lang/Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Sq.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Sq.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -74,7 +74,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine ndihme" +STID_WINE_HELP, "ReactOS ndihme" STID_WHERROR, "ERROR" STID_WARNING, "KuJDES" STID_INFO, "Informacion" Modified: trunk/reactos/base/applications/winhlp32/lang/Sr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Sr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Sr.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -75,7 +75,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine PomoÄ" +STID_WINE_HELP, "ReactOS PomoÄ" STID_WHERROR, "GREÅ KA" STID_WARNING, "UPOZORENJE" STID_INFO, "Informacija" Modified: trunk/reactos/base/applications/winhlp32/lang/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Sv.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Sv.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -76,7 +76,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine HjÃ¤lp" +STID_WINE_HELP, "ReactOS HjÃ¤lp" STID_WHERROR, "FEL" STID_WARNING, "VARNING" STID_INFO, "Information" Modified: trunk/reactos/base/applications/winhlp32/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Tr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Tr.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -72,7 +72,7 @@ STRINGTABLE { -STID_WINE_HELP, "YardÄ±m" +STID_WINE_HELP, "YardÄ±m ReactOS" STID_WHERROR, "YANLIÅLIK" STID_WARNING, "UYARI" STID_INFO, "Bilgi" Modified: trunk/reactos/base/applications/winhlp32/lang/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Uk.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Uk.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -80,7 +80,7 @@ STRINGTABLE { -STID_WINE_HELP, "ÐÐ¾Ð²ÑÐ´ÐºÐ° Wine" +STID_WINE_HELP, "ÐÐ¾Ð²ÑÐ´ÐºÐ° ReactOS" STID_WHERROR, "ÐÐÐÐÐÐÐ" STID_WARNING, "Ð£ÐÐÐÐ" STID_INFO, "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ" Modified: trunk/reactos/base/applications/winhlp32/lang/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Zh.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Zh.rc [iso-8859-1] Sun Feb 14 21:35:14 2016 @@ -78,7 +78,7 @@ STRINGTABLE { -STID_WINE_HELP, "Wine å¸®å©" +STID_WINE_HELP, "ReactOS å¸®å©" STID_WHERROR, "éè¯¯" STID_WARNING, "è¦å" STID_INFO, "ä¿¡æ¯"

1 0

[pschweitzer] 70748: [FASTFAT] [NTFS] Thanks to r70746, now, drop our beloved fix/hack/whatever about non-initialized floppy disks.
by pschweitzer＠svn.reactos.org 14 Feb '16

14 Feb '16

Author: pschweitzer Date: Sun Feb 14 19:56:17 2016 New Revision: 70748 URL: http://svn.reactos.org/svn/reactos?rev=70748&view=rev Log: [FASTFAT] [NTFS] Thanks to r70746, now, drop our beloved fix/hack/whatever about non-initialized floppy disks. Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c trunk/reactos/drivers/filesystems/ntfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Sun Feb 14 19:56:17 2016 @@ -120,16 +120,6 @@ PartitionInfoIsValid = TRUE; *RecognizedFS = TRUE; } - } - else if (DiskGeometry.MediaType == Unknown) - { - /* - * Floppy disk driver can return Unknown as media type if it - * doesn't know yet what floppy in the drive really is. This is - * perfectly correct to do under Windows. - */ - *RecognizedFS = TRUE; - DiskGeometry.BytesPerSector = 512; } else { Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Sun Feb 14 19:56:17 2016 @@ -89,10 +89,6 @@ return STATUS_UNRECOGNIZED_VOLUME; } } - else if (DiskGeometry.MediaType == Unknown) - { - DiskGeometry.BytesPerSector = 512; - } DPRINT1("BytesPerSector: %lu\n", DiskGeometry.BytesPerSector); BootSector = ExAllocatePoolWithTag(NonPagedPool,

1 0

[pschweitzer] 70747: [EXT2] Revert r70746, more appropriate fix was committed in r70746
by pschweitzer＠svn.reactos.org 14 Feb '16

14 Feb '16

Author: pschweitzer Date: Sun Feb 14 19:54:54 2016 New Revision: 70747 URL: http://svn.reactos.org/svn/reactos?rev=70747&view=rev Log: [EXT2] Revert r70746, more appropriate fix was committed in r70746 Modified: trunk/reactos/drivers/filesystems/ext2/src/fsctl.c Modified: trunk/reactos/drivers/filesystems/ext2/src/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/fsctl.c [iso-8859-1] Sun Feb 14 19:54:54 2016 @@ -1496,13 +1496,6 @@ _SEH2_LEAVE; } -#ifdef __REACTOS__ - if (DiskGeometry.MediaType == Unknown) - { - DiskGeometry.BytesPerSector = 512; - } -#endif - Status = IoCreateDevice( MainDeviceObject->DriverObject, sizeof(EXT2_VCB),

1 0

[pschweitzer] 70746: [FLOPPY] When discovering floppy controlers, immediately probe controlers to check whether they have a disk and if so, what's its geometry. This avoids waiting for the first re...
by pschweitzer＠svn.reactos.org 14 Feb '16

14 Feb '16

Author: pschweitzer Date: Sun Feb 14 19:53:47 2016 New Revision: 70746 URL: http://svn.reactos.org/svn/reactos?rev=70746&view=rev Log: [FLOPPY] When discovering floppy controlers, immediately probe controlers to check whether they have a disk and if so, what's its geometry. This avoids waiting for the first read, which will obviously never happen because FSD will try other operations depending on not set geometry. This implies a modification in RWDetermineMediaType() to avoid infinite wait, in case there's no disk at all in the controler. Addendum to r70725 Modified: trunk/reactos/drivers/storage/floppy/floppy.c trunk/reactos/drivers/storage/floppy/readwrite.c trunk/reactos/drivers/storage/floppy/readwrite.h Modified: trunk/reactos/drivers/storage/floppy/floppy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/flo… ============================================================================== --- trunk/reactos/drivers/storage/floppy/floppy.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/floppy.c [iso-8859-1] Sun Feb 14 19:53:47 2016 @@ -987,6 +987,11 @@ /* 3k: Clear the DO_DEVICE_INITIALIZING flag */ gControllerInfo[i].DriveInfo[j].DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + + /* 3l: Attempt to get drive info - if a floppy is already present */ + StartMotor(&gControllerInfo[i].DriveInfo[j]); + RWDetermineMediaType(&gControllerInfo[i].DriveInfo[j], TRUE); + StopMotor(gControllerInfo[i].DriveInfo[j].ControllerInfo); } } Modified: trunk/reactos/drivers/storage/floppy/readwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/rea… ============================================================================== --- trunk/reactos/drivers/storage/floppy/readwrite.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/readwrite.c [iso-8859-1] Sun Feb 14 19:53:47 2016 @@ -149,8 +149,8 @@ } -static NTSTATUS NTAPI -RWDetermineMediaType(PDRIVE_INFO DriveInfo) +NTSTATUS NTAPI +RWDetermineMediaType(PDRIVE_INFO DriveInfo, BOOLEAN OneShot) /* * FUNCTION: Determine the media type of the disk in the drive and fill in the geometry * ARGUMENTS: @@ -177,8 +177,8 @@ /* * This algorithm assumes that a 1.44MB floppy is in the drive. If it's not, - * it works backwards until the read works. Note that only 1.44 has been tested - * at all. + * it works backwards until the read works unless OneShot try is asked. + * Note that only 1.44 has been tested at all. */ do @@ -249,7 +249,10 @@ if(HwReadIdResult(DriveInfo->ControllerInfo, NULL, NULL) != STATUS_SUCCESS) { WARN_(FLOPPY, "RWDetermineMediaType(): ReadIdResult failed; continuing\n"); - continue; + if (OneShot) + break; + else + continue; } /* Found the media; populate the geometry now */ @@ -492,7 +495,7 @@ */ if(DriveInfo->DiskGeometry.MediaType == Unknown) { - if(RWDetermineMediaType(DriveInfo) != STATUS_SUCCESS) + if(RWDetermineMediaType(DriveInfo, FALSE) != STATUS_SUCCESS) { WARN_(FLOPPY, "ReadWritePassive(): unable to determine media type; completing with STATUS_UNSUCCESSFUL\n"); IoCompleteRequest(Irp, IO_NO_INCREMENT); Modified: trunk/reactos/drivers/storage/floppy/readwrite.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/rea… ============================================================================== --- trunk/reactos/drivers/storage/floppy/readwrite.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/readwrite.h [iso-8859-1] Sun Feb 14 19:53:47 2016 @@ -33,3 +33,6 @@ VOID NTAPI ReadWritePassive(PDRIVE_INFO DriveInfo, PIRP Irp); + +NTSTATUS NTAPI +RWDetermineMediaType(PDRIVE_INFO DriveInfo, BOOLEAN OneShot);

1 0

[ekohl] 70745: [USERINIT] Select the current keyboard layout in the keyloard layout list.
by ekohl＠svn.reactos.org 14 Feb '16

14 Feb '16

Author: ekohl Date: Sun Feb 14 18:57:12 2016 New Revision: 70745 URL: http://svn.reactos.org/svn/reactos?rev=70745&view=rev Log: [USERINIT] Select the current keyboard layout in the keyloard layout list. Modified: trunk/reactos/base/system/userinit/livecd.c Modified: trunk/reactos/base/system/userinit/livecd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/livec… ============================================================================== --- trunk/reactos/base/system/userinit/livecd.c [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/livecd.c [iso-8859-1] Sun Feb 14 18:57:12 2016 @@ -302,12 +302,16 @@ HWND hItemsList) { HKEY hKey; - WCHAR szLayoutID[9], KeyName[MAX_PATH]; + WCHAR szLayoutId[9], szCurrentLayoutId[9]; + WCHAR KeyName[MAX_PATH]; DWORD dwIndex = 0; DWORD dwSize; INT iIndex; LONG lError; - ULONG ulLayoutID; + ULONG ulLayoutId; + + if (!GetKeyboardLayoutNameW(szCurrentLayoutId)) + wcscpy(szCurrentLayoutId, L"00000409"); lError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\Keyboard Layouts", @@ -319,11 +323,11 @@ while (TRUE) { - dwSize = sizeof(szLayoutID) / sizeof(WCHAR); + dwSize = sizeof(szLayoutId) / sizeof(WCHAR); lError = RegEnumKeyExW(hKey, dwIndex, - szLayoutID, + szLayoutId, &dwSize, NULL, NULL, @@ -332,15 +336,14 @@ if (lError != ERROR_SUCCESS) break; - GetLayoutName(szLayoutID, KeyName); + GetLayoutName(szLayoutId, KeyName); iIndex = (INT)SendMessageW(hItemsList, CB_ADDSTRING, 0, (LPARAM)KeyName); - ulLayoutID = wcstoul(szLayoutID, NULL, 16); - SendMessageW(hItemsList, CB_SETITEMDATA, iIndex, (LPARAM)ulLayoutID); - - // FIXME! - if (wcscmp(szLayoutID, L"00000409") == 0) + ulLayoutId = wcstoul(szLayoutId, NULL, 16); + SendMessageW(hItemsList, CB_SETITEMDATA, iIndex, (LPARAM)ulLayoutId); + + if (wcscmp(szLayoutId, szCurrentLayoutId) == 0) { SendMessageW(hItemsList, CB_SETCURSEL, (WPARAM)iIndex, (LPARAM)0); }

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
16
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2016