Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 74043: [WS2_32] - Check for NULL pointers after HeapAlloc calls, in the constructor functions, before initializing members of created objects; - Add a bunch of missing HeapFree in the co...
by hbelusca＠svn.reactos.org 03 Mar '17

03 Mar '17

Author: hbelusca Date: Fri Mar 3 23:47:26 2017 New Revision: 74043 URL: http://svn.reactos.org/svn/reactos?rev=74043&view=rev Log: [WS2_32] - Check for NULL pointers after HeapAlloc calls, in the constructor functions, before initializing members of created objects; - Add a bunch of missing HeapFree in the corresponding destructor functions. In particular, fix the root cause of CID 1401152 in WsTpDelete: missing HeapFree call. CORE-12880 Modified: trunk/reactos/dll/win32/ws2_32/src/dcatitem.c trunk/reactos/dll/win32/ws2_32/src/dprocess.c trunk/reactos/dll/win32/ws2_32/src/dprovide.c trunk/reactos/dll/win32/ws2_32/src/dsocket.c trunk/reactos/dll/win32/ws2_32/src/dthread.c trunk/reactos/dll/win32/ws2_32/src/nscatent.c trunk/reactos/dll/win32/ws2_32/src/nsprovid.c trunk/reactos/dll/win32/ws2_32/src/nsquery.c Modified: trunk/reactos/dll/win32/ws2_32/src/dcatitem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/dcati… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/dcatitem.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/dcatitem.c [iso-8859-1] Fri Mar 3 23:47:26 2017 @@ -20,9 +20,11 @@ /* Allocate the catalog entry */ CatalogEntry = HeapAlloc(WsSockHeap, HEAP_ZERO_MEMORY, sizeof(*CatalogEntry)); - - /* Set the default non-null members */ - CatalogEntry->RefCount = 1; + if (CatalogEntry) + { + /* Set the default non-null members */ + CatalogEntry->RefCount = 1; + } /* Return it */ return CatalogEntry; Modified: trunk/reactos/dll/win32/ws2_32/src/dprocess.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/dproc… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/dprocess.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/dprocess.c [iso-8859-1] Fri Mar 3 23:47:26 2017 @@ -37,6 +37,8 @@ Process->ProtocolCatalogEvent = CreateEvent(NULL, TRUE, FALSE, NULL); Process->ProtocolCatalog = WsTcAllocate(); + // FIXME: Check for Process->ProtocolCatalog == NULL + /* Initialize it */ WsTcInitializeFromRegistry(Process->ProtocolCatalog, RootKey, @@ -46,6 +48,8 @@ Process->NamespaceCatalogEvent = CreateEvent(NULL, TRUE, FALSE, NULL); Process->NamespaceCatalog = WsNcAllocate(); + // FIXME: Check for Process->NamespaceCatalog == NULL + /* Initialize it */ ErrorCode = WsNcInitializeFromRegistry(Process->NamespaceCatalog, RootKey, @@ -64,9 +68,11 @@ /* Allocate the structure */ Process = HeapAlloc(WsSockHeap, HEAP_ZERO_MEMORY, sizeof(*Process)); - - /* Set default non-zero values */ - Process->Version = MAKEWORD(2,2); + if (Process) + { + /* Set default non-zero values */ + Process->Version = MAKEWORD(2,2); + } /* Return it */ return Process; @@ -296,6 +302,9 @@ /* Delete the thread lock */ DeleteCriticalSection(&Process->ThreadLock); + + /* Delete us */ + HeapFree(WsSockHeap, 0, Process); } VOID Modified: trunk/reactos/dll/win32/ws2_32/src/dprovide.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/dprov… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/dprovide.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/dprovide.c [iso-8859-1] Fri Mar 3 23:47:26 2017 @@ -21,12 +21,13 @@ { PTPROVIDER Provider; - DPRINT("WsTpAllocate: WsSockHeap %d\n", WsSockHeap); /* Allocate the object */ Provider = HeapAlloc(WsSockHeap, HEAP_ZERO_MEMORY, sizeof(*Provider)); - - /* Setup non-zero data */ - Provider->RefCount = 1; + if (Provider) + { + /* Setup non-zero data */ + Provider->RefCount = 1; + } /* Return it */ return Provider; @@ -130,10 +131,11 @@ /* Unload the library */ FreeLibrary(Provider->DllHandle); - - /* Clear the handle value */ Provider->DllHandle = NULL; } + + /* Delete us */ + HeapFree(WsSockHeap, 0, Provider); } VOID Modified: trunk/reactos/dll/win32/ws2_32/src/dsocket.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/dsock… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/dsocket.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/dsocket.c [iso-8859-1] Fri Mar 3 23:47:26 2017 @@ -50,11 +50,13 @@ PWSSOCKET Socket; /* Allocate the socket object */ - Socket = HeapAlloc(WsSockHeap, HEAP_ZERO_MEMORY, sizeof(WSSOCKET)); - - /* Setup default non-zero values */ - Socket->RefCount = 2; - Socket->Overlapped = TRUE; + Socket = HeapAlloc(WsSockHeap, HEAP_ZERO_MEMORY, sizeof(*Socket)); + if (Socket) + { + /* Setup default non-zero values */ + Socket->RefCount = 2; + Socket->Overlapped = TRUE; + } /* Return it */ return Socket; @@ -193,6 +195,9 @@ WsTcEntryDereference(Socket->CatalogEntry); Socket->CatalogEntry = NULL; } + + /* Delete us */ + HeapFree(WsSockHeap, 0, Socket); } VOID Modified: trunk/reactos/dll/win32/ws2_32/src/dthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/dthre… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/dthread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/dthread.c [iso-8859-1] Fri Mar 3 23:47:26 2017 @@ -138,9 +138,11 @@ /* Allocate the object */ Thread = HeapAlloc(WsSockHeap, HEAP_ZERO_MEMORY, sizeof(*Thread)); - - /* Set non-zero data */ - Thread->BlockingHook = (FARPROC)WsThreadDefaultBlockingHook; + if (Thread) + { + /* Set non-zero data */ + Thread->BlockingHook = (FARPROC)WsThreadDefaultBlockingHook; + } /* Return it */ return Thread; Modified: trunk/reactos/dll/win32/ws2_32/src/nscatent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/nscat… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/nscatent.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/nscatent.c [iso-8859-1] Fri Mar 3 23:47:26 2017 @@ -20,11 +20,13 @@ /* Allocate the catalog */ CatalogEntry = HeapAlloc(WsSockHeap, HEAP_ZERO_MEMORY, sizeof(*CatalogEntry)); - - /* Set the default non-null members */ - CatalogEntry->RefCount = 1; - CatalogEntry->Enabled = TRUE; - CatalogEntry->AddressFamily = -1; + if (CatalogEntry) + { + /* Set the default non-null members */ + CatalogEntry->RefCount = 1; + CatalogEntry->Enabled = TRUE; + CatalogEntry->AddressFamily = -1; + } /* Return it */ return CatalogEntry; Modified: trunk/reactos/dll/win32/ws2_32/src/nsprovid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/nspro… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/nsprovid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/nsprovid.c [iso-8859-1] Fri Mar 3 23:47:26 2017 @@ -66,12 +66,14 @@ /* Allocate the object */ Provider = HeapAlloc(WsSockHeap, HEAP_ZERO_MEMORY, sizeof(*Provider)); - - /* Set non-null data */ - Provider->RefCount = 1; - Provider->Service.cbSize = sizeof(NSP_ROUTINE); - - /* Return us */ + if (Provider) + { + /* Set non-null data */ + Provider->RefCount = 1; + Provider->Service.cbSize = sizeof(NSP_ROUTINE); + } + + /* Return it */ return Provider; } @@ -129,6 +131,7 @@ Fail: /* Bail out */ if (Provider->DllHandle) FreeLibrary(Provider->DllHandle); + Provider->DllHandle = NULL; return ErrorCode; } @@ -165,10 +168,11 @@ /* Unload the library */ FreeLibrary(Provider->DllHandle); - - /* Clear the handle value */ Provider->DllHandle = NULL; } + + /* Delete us */ + HeapFree(WsSockHeap, 0, Provider); } VOID Modified: trunk/reactos/dll/win32/ws2_32/src/nsquery.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/nsque… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/nsquery.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/nsquery.c [iso-8859-1] Fri Mar 3 23:47:26 2017 @@ -25,11 +25,13 @@ /* Allocate the object */ NsQuery = HeapAlloc(WsSockHeap, HEAP_ZERO_MEMORY, sizeof(*NsQuery)); - - /* Set non-zero fields */ - NsQuery->Signature = ~0xBEADFACE; - InitializeListHead(&NsQuery->ProviderList); - NsQuery->TryAgain = TRUE; + if (NsQuery) + { + /* Set non-zero fields */ + NsQuery->Signature = ~0xBEADFACE; + InitializeListHead(&NsQuery->ProviderList); + NsQuery->TryAgain = TRUE; + } /* Return it */ return NsQuery;

1 0

[hbelusca] 74042: [WS2_32]: Addendum to r74041: Forgot these changes too. CORE-12880
by hbelusca＠svn.reactos.org 03 Mar '17

03 Mar '17

Author: hbelusca Date: Fri Mar 3 23:34:47 2017 New Revision: 74042 URL: http://svn.reactos.org/svn/reactos?rev=74042&view=rev Log: [WS2_32]: Addendum to r74041: Forgot these changes too. CORE-12880 Modified: trunk/reactos/dll/win32/ws2_32/inc/ws2_32p.h Modified: trunk/reactos/dll/win32/ws2_32/inc/ws2_32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/inc/ws2_3… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/inc/ws2_32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/inc/ws2_32p.h [iso-8859-1] Fri Mar 3 23:34:47 2017 @@ -315,9 +315,9 @@ INT WSAAPI -MapUnicodeQuerySetToAnsi(OUT LPWSAQUERYSETW UnicodeSet, +MapUnicodeQuerySetToAnsi(IN LPWSAQUERYSETW UnicodeSet, IN OUT PSIZE_T SetSize, - IN LPWSAQUERYSETA AnsiSet); + OUT LPWSAQUERYSETA AnsiSet); INT WSAAPI @@ -435,7 +435,7 @@ WsNcEntrySetProvider(IN PNSCATALOG_ENTRY Entry, IN PNS_PROVIDER Provider); -DWORD +BOOL WSAAPI WsNqAddProvider( IN PNSQUERY NsQuery, @@ -490,6 +490,13 @@ IN PNSQUERY_PROVIDER Provider ); +PNSQUERY_PROVIDER +WSAAPI +WsNqPreviousProvider( + IN PNSQUERY Query, + IN PNSQUERY_PROVIDER Provider +); + VOID WSAAPI WsNqDereference(IN PNSQUERY Query); @@ -497,11 +504,6 @@ BOOL WSAAPI WsNqValidateAndReference(IN PNSQUERY Query); - -PNSQUERY_PROVIDER -WSAAPI -WsNqPreviousProvider(IN PNSQUERY Query, - IN PNSQUERY_PROVIDER Provider); DWORD WSAAPI

1 0

[hbelusca] 74041: [WS2_32]: Cosmetic changes first, before real fixes - CORE-12880 : - Use IsListEmpty where needed; - Initialize NextEntry using Catalog->ProtocolList after the lock on the catalog...
by hbelusca＠svn.reactos.org 03 Mar '17

03 Mar '17

Author: hbelusca Date: Fri Mar 3 23:31:32 2017 New Revision: 74041 URL: http://svn.reactos.org/svn/reactos?rev=74041&view=rev Log: [WS2_32]: Cosmetic changes first, before real fixes - CORE-12880 : - Use IsListEmpty where needed; - Initialize NextEntry using Catalog->ProtocolList after the lock on the catalog has been acquired; - Rearrange WsNqLookupServiceNext to reduce the code indent level; also, convert the construct "if (var) { do { ... } while (var); }" into a mere "while (var) { ... }"; - WsNqPreviousProvider: the "next" provider is the previous one...; - WsNqAddProvider: Use a more standard name for the boolean return value; - Fix the annotation of MapUnicodeQuerySetToAnsi; - Factor out setting the SetLastError WSALookupServiceBeginA. Modified: trunk/reactos/dll/win32/ws2_32/src/async.c trunk/reactos/dll/win32/ws2_32/src/dcatalog.c trunk/reactos/dll/win32/ws2_32/src/nscatalo.c trunk/reactos/dll/win32/ws2_32/src/nsquery.c trunk/reactos/dll/win32/ws2_32/src/qshelpr.c trunk/reactos/dll/win32/ws2_32/src/rnr.c Modified: trunk/reactos/dll/win32/ws2_32/src/async.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/async… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/async.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/async.c [iso-8859-1] Fri Mar 3 23:31:32 2017 @@ -721,7 +721,7 @@ WsAsyncLock(); /* Process the queue */ - while (ListHead->Flink != ListHead) + while (!IsListEmpty(ListHead)) { /* Remove this entry and get the async block */ Entry = RemoveHeadList(ListHead); Modified: trunk/reactos/dll/win32/ws2_32/src/dcatalog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/dcata… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/dcatalog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/dcatalog.c [iso-8859-1] Fri Mar 3 23:31:32 2017 @@ -384,7 +384,7 @@ IN PTCATALOG_ENTRY *CatalogEntry) { INT ErrorCode = WSAEINVAL; - PLIST_ENTRY NextEntry = Catalog->ProtocolList.Flink; + PLIST_ENTRY NextEntry; PTCATALOG_ENTRY Entry; /* Assume failure */ @@ -394,6 +394,7 @@ WsTcLock(); /* Match the Id with all the entries in the List */ + NextEntry = Catalog->ProtocolList.Flink; while (NextEntry != &Catalog->ProtocolList) { /* Get the Current Entry */ @@ -435,13 +436,14 @@ IN PTCATALOG_ENTRY *CatalogEntry) { INT ErrorCode = WSAEINVAL; - PLIST_ENTRY NextEntry = Catalog->ProtocolList.Flink; + PLIST_ENTRY NextEntry; PTCATALOG_ENTRY Entry; /* Lock the catalog */ WsTcLock(); /* Match the Id with all the entries in the List */ + NextEntry = Catalog->ProtocolList.Flink; while (NextEntry != &Catalog->ProtocolList) { /* Get the Current Entry */ @@ -483,7 +485,7 @@ IN PTCATALOG_ENTRY *CatalogEntry) { INT ErrorCode = WSAEINVAL; - PLIST_ENTRY NextEntry = Catalog->ProtocolList.Flink; + PLIST_ENTRY NextEntry; PTCATALOG_ENTRY Entry; DPRINT("WsTcGetEntryFromTriplet: %lx, %lx, %lx, %lx\n", af, type, protocol, StartId); @@ -492,6 +494,8 @@ /* Lock the catalog */ WsTcLock(); + + NextEntry = Catalog->ProtocolList.Flink; /* Check if we are starting past 0 */ if (StartId) @@ -674,14 +678,14 @@ RemoveEntryList(&Catalog->ProtocolList); InitializeListHead(&Catalog->ProtocolList); - /* Loop every item on the list */ + /* Loop every item in the list */ while (!IsListEmpty(List)) { /* Get the catalog entry */ Entry = RemoveHeadList(List); CatalogEntry = CONTAINING_RECORD(Entry, TCATALOG_ENTRY, CatalogLink); - /* Check if this item is already on our list */ + /* Check if this item is already in our list */ Entry = TempList.Flink; while (Entry != &TempList) { @@ -709,7 +713,7 @@ Catalog->ItemCount++; } - /* If there's anything left on the temporary list */ + /* If there's anything left in the temporary list */ while (!IsListEmpty(&TempList)) { /* Get the entry */ Modified: trunk/reactos/dll/win32/ws2_32/src/nscatalo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/nscat… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/nscatalo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/nscatalo.c [iso-8859-1] Fri Mar 3 23:31:32 2017 @@ -498,13 +498,14 @@ IN LPGUID ProviderId, OUT PNSCATALOG_ENTRY *CatalogEntry) { - PLIST_ENTRY NextEntry = Catalog->CatalogList.Flink; + PLIST_ENTRY NextEntry; PNSCATALOG_ENTRY Entry; /* Lock the catalog */ WsNcLock(); /* Match the Id with all the entries in the List */ + NextEntry = Catalog->CatalogList.Flink; while (NextEntry != &Catalog->CatalogList) { /* Get the Current Entry */ Modified: trunk/reactos/dll/win32/ws2_32/src/nsquery.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/nsque… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/nsquery.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/nsquery.c [iso-8859-1] Fri Mar 3 23:31:32 2017 @@ -134,9 +134,9 @@ if (!(Provider = Entry->Provider)) { /* None was loaded, load it */ - if ((WsNcLoadProvider(EnumContext->Catalog, Entry) != ERROR_SUCCESS)) + if (WsNcLoadProvider(EnumContext->Catalog, Entry) != ERROR_SUCCESS) { - /* return TRUE to continue enumerating */ + /* Return TRUE to continue enumerating */ return TRUE; } @@ -145,7 +145,7 @@ } /* Add it to the query */ - if (!(WsNqAddProvider(NsQuery, Provider))) + if (!WsNqAddProvider(NsQuery, Provider)) { /* We failed */ EnumContext->ErrorCode = WSASYSCALLFAILURE; @@ -194,157 +194,150 @@ OUT PDWORD BufferLength, OUT LPWSAQUERYSETW Results) { + INT ErrorCode = SOCKET_ERROR, OldErrorCode; PNSQUERY_PROVIDER Provider, NextProvider; - INT ErrorCode = SOCKET_ERROR, OldErrorCode; PLIST_ENTRY Entry; /* Make sure we're not shutting down */ - if (!NsQuery->ShuttingDown) - { - /* Acquire query lock */ + if (NsQuery->ShuttingDown) + { + /* We are shutting down, fail */ + SetLastError(WSAECANCELLED); + return ErrorCode; + } + + /* Acquire query lock */ + WsNqLock(); + + /* Check if we already have an active provider */ + NextProvider = NsQuery->ActiveProvider; + if (!NextProvider) + { + /* Make sure we have a current provider */ + if (!NsQuery->CurrentProvider) + { + /* We don't; fail */ + WsNqUnlock(); + SetLastError(WSA_E_NO_MORE); + return SOCKET_ERROR; + } + + /* Get the last provider in the list and start looping */ + Entry = NsQuery->ProviderList.Blink; + NextProvider = CONTAINING_RECORD(Entry, NSQUERY_PROVIDER, QueryLink); + while (NextProvider) + { + /* Check if this is a new-style provider */ + if (NextProvider->Provider->Service.NSPIoctl) + { + /* Remove it and re-add it on top */ + RemoveEntryList(&NextProvider->QueryLink); + InsertHeadList(&NsQuery->ProviderList, &NextProvider->QueryLink); + + /* Set it as the active provider and exit the loop */ + NsQuery->ActiveProvider = NextProvider; + break; + } + + /* Get the previous provider */ + NextProvider = WsNqPreviousProvider(NsQuery, NextProvider); + } + } + + /* Release the lock */ + WsNqUnlock(); + + /* Restart and keep looping as long as there is an active provider */ + while (NextProvider) + { + /* Call its routine */ + ErrorCode = WsNqProvLookupServiceNext(NextProvider, + ControlFlags, + BufferLength, + Results); + /* Check for error or shutdown */ + if ((ErrorCode == ERROR_SUCCESS) || + (GetLastError() == WSAEFAULT) || (NsQuery->ShuttingDown)) + { + /* Get out */ + break; + } + + /* Acquire Query Lock */ WsNqLock(); - /* Check if we already have an active provider */ - NextProvider = NsQuery->ActiveProvider; - if (!NextProvider) - { - /* Make sure we have a current provider */ - if (!NsQuery->CurrentProvider) + /* Save the current active provider */ + Provider = NsQuery->ActiveProvider; + + /* Check if one exists */ + if (Provider) + { + /* Get the next one */ + NextProvider = WsNqNextProvider(NsQuery, + NsQuery->ActiveProvider); + + /* Was the old provider our active? */ + if (Provider == NsQuery->ActiveProvider) { - /* We don't; fail */ - WsNqUnlock(); - SetLastError(WSA_E_NO_MORE); - return SOCKET_ERROR; + /* Change our active provider to the new one */ + NsQuery->ActiveProvider = NextProvider; } - - /* Get the first provider on the list and start looping */ - Entry = NsQuery->ProviderList.Blink; - NextProvider = CONTAINING_RECORD(Entry, NSQUERY_PROVIDER, QueryLink); - while (NextProvider) + } + else + { + /* No next provider */ + NextProvider = NULL; + } + + /* Check if we failed and if we can try again */ + if (!(NextProvider) && + (ErrorCode == SOCKET_ERROR) && + (NsQuery->TryAgain)) + { + /* Save the error code so RAS doesn't overwrite it */ + OldErrorCode = GetLastError(); + + /* Make sure we won't try for a 3rd time */ + NsQuery->TryAgain = FALSE; + + /* Call the helper to auto-dial */ + if (WSAttemptAutodialName(NsQuery->QuerySet)) { - /* Check if this is a new-style provider */ - if (NextProvider->Provider->Service.NSPIoctl) + /* It succeeded, so we'll delete the current state. */ + while (!IsListEmpty(&NsQuery->ProviderList)) { - /* Remove it and re-add it on top */ - RemoveEntryList(&NextProvider->QueryLink); - InsertHeadList(&NsQuery->ProviderList, &NextProvider->QueryLink); - - /* Set it as the active provider and exit the loop */ - NsQuery->ActiveProvider = NextProvider; - break; + /* Remove the entry and get its provider */ + Entry = RemoveHeadList(&NsQuery->ProviderList); + Provider = CONTAINING_RECORD(Entry, + NSQUERY_PROVIDER, + QueryLink); + + /* Reset it */ + WsNqProvLookupServiceEnd(Provider); + WsNqProvDelete(Provider); } - /* Get the previous provider */ - NextProvider = WsNqPreviousProvider(NsQuery, NextProvider); + /* Start a new query */ + if (WsNqLookupServiceBegin(NsQuery, + NsQuery->QuerySet, + NsQuery->ControlFlags, + NsQuery->Catalog) == ERROR_SUCCESS) + { + /* New query succeeded, set active provider now */ + NsQuery->ActiveProvider = + WsNqNextProvider(NsQuery, + NsQuery->ActiveProvider); + } } - } - - /* Release the lock */ + else + { + /* Reset the error code */ + SetLastError(OldErrorCode); + } + } + + /* Release lock */ WsNqUnlock(); - - /* Check if we have an active provider now */ - if (NextProvider) - { - /* Start loop */ - do - { - /* Call its routine */ - ErrorCode = WsNqProvLookupServiceNext(NextProvider, - ControlFlags, - BufferLength, - Results); - /* Check for error or shutdown */ - if ((ErrorCode == ERROR_SUCCESS) || - (GetLastError() == WSAEFAULT) || (NsQuery->ShuttingDown)) - { - /* Get out */ - break; - } - - /* Acquire Query Lock */ - WsNqLock(); - - /* Save the current active provider */ - Provider = NsQuery->ActiveProvider; - - /* Check if one exists */ - if (Provider) - { - /* Get the next one */ - NextProvider = WsNqNextProvider(NsQuery, - NsQuery->ActiveProvider); - - /* Was the old provider our active? */ - if (Provider == NsQuery->ActiveProvider) - { - /* Change our active provider to the new one */ - NsQuery->ActiveProvider = NextProvider; - } - } - else - { - /* No next provider */ - NextProvider = NULL; - } - - /* Check if we failed and if we can try again */ - if (!(NextProvider) && - (ErrorCode == SOCKET_ERROR) && - (NsQuery->TryAgain)) - { - /* Save the error code so RAS doesn't overwrite it */ - OldErrorCode = GetLastError(); - - /* Make sure we won't try for a 3rd time */ - NsQuery->TryAgain = FALSE; - - /* Call the helper to auto-dial */ - if (WSAttemptAutodialName(NsQuery->QuerySet)) - { - /* It succeeded, so we'll delete the current state. */ - while (!IsListEmpty(&NsQuery->ProviderList)) - { - /* Remove the entry and get its provider */ - Entry = RemoveHeadList(&NsQuery->ProviderList); - Provider = CONTAINING_RECORD(Entry, - NSQUERY_PROVIDER, - QueryLink); - - /* Reset it */ - WsNqProvLookupServiceEnd(Provider); - WsNqProvDelete(Provider); - } - - /* Start a new query */ - if (!WsNqLookupServiceBegin(NsQuery, - NsQuery->QuerySet, - NsQuery->ControlFlags, - NsQuery->Catalog)) - { - /* New query succeeded, set active provider now */ - NsQuery->ActiveProvider = - WsNqNextProvider(NsQuery, - NsQuery->ActiveProvider); - } - } - else - { - /* Reset the error code */ - SetLastError(OldErrorCode); - } - } - - /* Release lock */ - WsNqUnlock(); - - /* Keep looping as long as there is a provider */ - } while (NextProvider); - } - } - else - { - /* We are shuting down; fail */ - SetLastError(WSAECANCELLED); } /* Return */ @@ -359,9 +352,8 @@ IN PNSCATALOG Catalog) { WSASERVICECLASSINFOW ClassInfo; - PNSQUERY_PROVIDER Provider; LPWSASERVICECLASSINFOW pClassInfo = &ClassInfo; - PNSQUERY_PROVIDER NextProvider; + PNSQUERY_PROVIDER Provider, NextProvider; PLIST_ENTRY Entry; INT ErrorCode; DWORD ClassInfoSize; @@ -539,28 +531,28 @@ WsNqPreviousProvider(IN PNSQUERY Query, IN PNSQUERY_PROVIDER Provider) { - PNSQUERY_PROVIDER NextProvider = NULL; + PNSQUERY_PROVIDER PrevProvider = NULL; PLIST_ENTRY Entry; - /* Get the first entry and get its provider */ + /* Get the last entry and get its provider */ Entry = Provider->QueryLink.Blink; if (Entry != &Query->ProviderList) { /* Get the current provider */ - NextProvider = CONTAINING_RECORD(Entry, NSQUERY_PROVIDER, QueryLink); + PrevProvider = CONTAINING_RECORD(Entry, NSQUERY_PROVIDER, QueryLink); } /* Return it */ - return NextProvider; -} - -DWORD + return PrevProvider; +} + +BOOL WSAAPI WsNqAddProvider(IN PNSQUERY Query, IN PNS_PROVIDER Provider) { + BOOL Success = TRUE; PNSQUERY_PROVIDER QueryProvider; - DWORD Return = TRUE; /* Allocate a new Query Provider */ if ((QueryProvider = WsNqProvAllocate())) @@ -575,11 +567,10 @@ { /* We failed */ SetLastError(WSASYSCALLFAILURE); - Return = FALSE; + Success = FALSE; } /* Return */ - return Return; -} - - + return Success; +} + Modified: trunk/reactos/dll/win32/ws2_32/src/qshelpr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/qshel… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/qshelpr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/qshelpr.c [iso-8859-1] Fri Mar 3 23:31:32 2017 @@ -926,9 +926,9 @@ INT WSAAPI -MapUnicodeQuerySetToAnsi(OUT LPWSAQUERYSETW UnicodeSet, +MapUnicodeQuerySetToAnsi(IN LPWSAQUERYSETW UnicodeSet, IN OUT PSIZE_T SetSize, - IN LPWSAQUERYSETA AnsiSet) + OUT LPWSAQUERYSETA AnsiSet) { INT ErrorCode = ERROR_SUCCESS; SIZE_T UnicodeSize, AnsiSize; Modified: trunk/reactos/dll/win32/ws2_32/src/rnr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/rnr.c… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/rnr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/rnr.c [iso-8859-1] Fri Mar 3 23:31:32 2017 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 API * FILE: dll/win32/ws2_32_new/src/rnr.c - * PURPOSE: Registration n' Resolution Support + * PURPOSE: Registration and Resolution Support * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ @@ -285,11 +285,6 @@ dwControlFlags, lphLookup); } - else - { - /* Fail, conversion failed */ - SetLastError(ErrorCode); - } /* Free our buffer */ HeapFree(WsSockHeap, 0, UnicodeQuerySet); @@ -297,14 +292,13 @@ else { /* No memory to allocate */ - SetLastError(WSAEFAULT); + ErrorCode = WSAEFAULT; } } - else - { - /* We couldn't get the size for some reason */ + + /* Set the error in case of failure */ + if (ErrorCode != ERROR_SUCCESS) SetLastError(ErrorCode); - } /* Return to caller */ return ErrorCode == ERROR_SUCCESS ? ErrorCode : SOCKET_ERROR;

1 0

[rnaumann] 74040: [FONTS] Add Libre Franklin Font v4.0.15 [USETUP] Add Font Substitutions for Franklin Gothic and MS Trebuchet CORE-12878 CORE-12877 Now Luna uses better fonts but the font styles a...
by rnaumann＠svn.reactos.org 03 Mar '17

03 Mar '17

Author: rnaumann Date: Fri Mar 3 22:07:00 2017 New Revision: 74040 URL: http://svn.reactos.org/svn/reactos?rev=74040&view=rev Log: [FONTS] Add Libre Franklin Font v4.0.15 [USETUP] Add Font Substitutions for Franklin Gothic and MS Trebuchet CORE-12878 CORE-12877 Now Luna uses better fonts but the font styles are still not used. Added: trunk/reactos/media/fonts/LibreFranklin-Black.ttf (with props) trunk/reactos/media/fonts/LibreFranklin-BlackItalic.ttf (with props) trunk/reactos/media/fonts/LibreFranklin-Bold.ttf (with props) trunk/reactos/media/fonts/LibreFranklin-BoldItalic.ttf (with props) trunk/reactos/media/fonts/LibreFranklin-ExtraBold.ttf (with props) trunk/reactos/media/fonts/LibreFranklin-ExtraBoldItalic.ttf (with props) trunk/reactos/media/fonts/LibreFranklin-ExtraLight.ttf (with props) trunk/reactos/media/fonts/LibreFranklin-ExtraLightItalic.ttf (with props) trunk/reactos/media/fonts/LibreFranklin-Italic.ttf (with props) trunk/reactos/media/fonts/LibreFranklin-Light.ttf (with props) trunk/reactos/media/fonts/LibreFranklin-LightItalic.ttf (with props) trunk/reactos/media/fonts/LibreFranklin-Medium.ttf (with props) trunk/reactos/media/fonts/LibreFranklin-MediumItalic.ttf (with props) trunk/reactos/media/fonts/LibreFranklin-Regular.ttf (with props) trunk/reactos/media/fonts/LibreFranklin-SemiBold.ttf (with props) trunk/reactos/media/fonts/LibreFranklin-SemiBoldItalic.ttf (with props) trunk/reactos/media/fonts/LibreFranklin-Thin.ttf (with props) trunk/reactos/media/fonts/LibreFranklin-ThinItalic.ttf (with props) trunk/reactos/media/fonts/doc/LibreFranklin/ trunk/reactos/media/fonts/doc/LibreFranklin/SIL Open Font License.txt (with props) Modified: trunk/reactos/base/setup/usetup/muifonts.h trunk/reactos/media/fonts/CMakeLists.txt Modified: trunk/reactos/base/setup/usetup/muifonts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muifonts… ============================================================================== --- trunk/reactos/base/setup/usetup/muifonts.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muifonts.h [iso-8859-1] Fri Mar 3 22:07:00 2017 @@ -4,110 +4,122 @@ { /*Font Substitute */ - { L"Arial", L"Liberation Sans" }, - { L"Courier", L"FreeMono" }, - { L"Courier New", L"FreeMono" }, - { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, - { L"Helv", L"Tahoma" }, - { L"Helvetica", L"Liberation Sans" }, - { L"Lucida Console", L"DejaVu Sans Mono" }, - { L"MS Sans Serif", L"Tahoma" }, - { L"MS Shell Dlg", L"Tahoma" }, - { L"MS Shell Dlg 2", L"Tahoma" }, - { L"Tahoma", L"Tahoma" }, - { L"Terminal", L"DejaVu Sans Mono" }, - { L"Times New Roman", L"Liberation Serif" }, + { L"Arial", L"Liberation Sans" }, + { L"Courier", L"FreeMono" }, + { L"Courier New", L"FreeMono" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, + { L"Franklin Gothic Medium", L"Libre Franklin" }, + { L"Helv", L"Tahoma" }, + { L"Helvetica", L"Liberation Sans" }, + { L"Lucida Console", L"DejaVu Sans Mono" }, + { L"MS Sans Serif", L"Tahoma" }, + { L"MS Shell Dlg", L"Tahoma" }, + { L"MS Shell Dlg 2", L"Tahoma" }, + { L"Tahoma", L"Tahoma" }, + { L"Terminal", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, + { L"Trebuchet MS", L"Open Sans" }, { NULL, NULL } }; MUI_SUBFONT CyrillicFonts[] = { - { L"Arial", L"Liberation Sans" }, - { L"Courier", L"FreeMono" }, - { L"Courier New", L"FreeMono" }, - { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, - { L"Helv", L"Tahoma" }, - { L"Helvetica", L"Liberation Sans" }, - { L"Lucida Console", L"DejaVu Sans Mono" }, - { L"MS Sans Serif", L"Tahoma" }, - { L"MS Shell Dlg", L"Tahoma" }, - { L"MS Shell Dlg 2", L"Tahoma" }, - { L"Tahoma", L"Tahoma" }, - { L"Terminal", L"DejaVu Sans Mono" }, - { L"Times New Roman", L"Liberation Serif" }, + { L"Arial", L"Liberation Sans" }, + { L"Courier", L"FreeMono" }, + { L"Courier New", L"FreeMono" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, + { L"Franklin Gothic Medium", L"Libre Franklin" }, + { L"Helv", L"Tahoma" }, + { L"Helvetica", L"Liberation Sans" }, + { L"Lucida Console", L"DejaVu Sans Mono" }, + { L"MS Sans Serif", L"Tahoma" }, + { L"MS Shell Dlg", L"Tahoma" }, + { L"MS Shell Dlg 2", L"Tahoma" }, + { L"Tahoma", L"Tahoma" }, + { L"Terminal", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, + { L"Trebuchet MS", L"Open Sans" }, { NULL, NULL } }; MUI_SUBFONT GreekFonts[] = { - { L"Arial", L"Liberation Sans" }, - { L"Courier", L"FreeMono" }, - { L"Courier New", L"FreeMono" }, - { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, - { L"Helv", L"DejaVu Sans" }, - { L"Helvetica", L"Liberation Sans" }, - { L"Lucida Console", L"DejaVu Sans Mono" }, - { L"MS Sans Serif", L"DejaVu Sans" }, - { L"MS Shell Dlg", L"DejaVu Sans" }, - { L"MS Shell Dlg 2", L"DejaVu Sans" }, - { L"Tahoma", L"DejaVu Sans" }, - { L"Terminal", L"DejaVu Sans Mono" }, - { L"Times New Roman", L"Liberation Serif" }, + { L"Arial", L"Liberation Sans" }, + { L"Courier", L"FreeMono" }, + { L"Courier New", L"FreeMono" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, + { L"Franklin Gothic Medium", L"Libre Franklin" }, + { L"Helv", L"DejaVu Sans" }, + { L"Helvetica", L"Liberation Sans" }, + { L"Lucida Console", L"DejaVu Sans Mono" }, + { L"MS Sans Serif", L"DejaVu Sans" }, + { L"MS Shell Dlg", L"DejaVu Sans" }, + { L"MS Shell Dlg 2", L"DejaVu Sans" }, + { L"Tahoma", L"DejaVu Sans" }, + { L"Terminal", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, + { L"Trebuchet MS", L"Open Sans" }, { NULL, NULL } }; MUI_SUBFONT HebrewFonts[] = { - { L"Arial", L"DejaVu Sans" }, - { L"Courier", L"FreeMono" }, - { L"Courier New", L"FreeMono" }, - { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, - { L"Helv", L"DejaVu Sans" }, - { L"Helvetica", L"DejaVu Sans" }, - { L"Lucida Console", L"DejaVu Sans Mono" }, - { L"MS Sans Serif", L"DejaVu Sans" }, - { L"MS Shell Dlg", L"DejaVu Sans" }, - { L"MS Shell Dlg 2", L"DejaVu Sans" }, - { L"Tahoma", L"DejaVu Sans" }, - { L"Terminal", L"DejaVu Sans Mono" }, - { L"Times New Roman", L"DejaVu Serif" }, + { L"Arial", L"DejaVu Sans" }, + { L"Courier", L"FreeMono" }, + { L"Courier New", L"FreeMono" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, + { L"Franklin Gothic Medium", L"Libre Franklin" }, + { L"Helv", L"DejaVu Sans" }, + { L"Helvetica", L"DejaVu Sans" }, + { L"Lucida Console", L"DejaVu Sans Mono" }, + { L"MS Sans Serif", L"DejaVu Sans" }, + { L"MS Shell Dlg", L"DejaVu Sans" }, + { L"MS Shell Dlg 2", L"DejaVu Sans" }, + { L"Tahoma", L"DejaVu Sans" }, + { L"Terminal", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"DejaVu Serif" }, + { L"Trebuchet MS", L"Open Sans" }, { NULL, NULL } }; MUI_SUBFONT CJKFonts[] = { - { L"Arial", L"Liberation Sans" }, - { L"Courier", L"FreeMono" }, - { L"Courier New", L"FreeMono" }, - { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, - { L"Helv", L"Droid Sans Fallback" }, - { L"Helvetica", L"Liberation Sans" }, - { L"Lucida Console", L"DejaVu Sans Mono" }, - { L"MS Sans Serif", L"Droid Sans Fallback" }, - { L"MS Shell Dlg", L"Droid Sans Fallback" }, - { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, - { L"MS UI Gothic", L"Droid Sans Fallback" }, - { L"MS UI Gothic 2", L"Droid Sans Fallback" }, - { L"Tahoma", L"Droid Sans Fallback" }, - { L"Terminal", L"DejaVu Sans Mono" }, - { L"Times New Roman", L"Liberation Serif" }, + { L"Arial", L"Liberation Sans" }, + { L"Courier", L"FreeMono" }, + { L"Courier New", L"FreeMono" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, + { L"Franklin Gothic Medium", L"Libre Franklin" }, + { L"Helv", L"Droid Sans Fallback" }, + { L"Helvetica", L"Liberation Sans" }, + { L"Lucida Console", L"DejaVu Sans Mono" }, + { L"MS Sans Serif", L"Droid Sans Fallback" }, + { L"MS Shell Dlg", L"Droid Sans Fallback" }, + { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, + { L"MS UI Gothic", L"Droid Sans Fallback" }, + { L"MS UI Gothic 2", L"Droid Sans Fallback" }, + { L"Tahoma", L"Droid Sans Fallback" }, + { L"Terminal", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, + { L"Trebuchet MS", L"Open Sans" }, { NULL, NULL } }; MUI_SUBFONT UnicodeFonts[] = { - { L"Arial", L"DejaVu Sans" }, - { L"Courier", L"DejaVu Sans Mono" }, - { L"Courier New", L"DejaVu Sans Mono" }, - { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, - { L"Helv", L"DejaVu Sans" }, - { L"Helvetica", L"DejaVu Sans" }, - { L"Lucida Console", L"DejaVu Sans Mono" }, - { L"MS Sans Serif", L"DejaVu Sans" }, - { L"MS Shell Dlg", L"DejaVu Sans" }, - { L"MS Shell Dlg 2", L"DejaVu Sans" }, - { L"Tahoma", L"DejaVu Sans" }, - { L"Terminal", L"DejaVu Sans Mono" }, - { L"Times New Roman", L"DejaVu Serif" }, + { L"Arial", L"DejaVu Sans" }, + { L"Courier", L"DejaVu Sans Mono" }, + { L"Courier New", L"DejaVu Sans Mono" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, + { L"Franklin Gothic Medium", L"Libre Franklin" }, + { L"Helv", L"DejaVu Sans" }, + { L"Helvetica", L"DejaVu Sans" }, + { L"Lucida Console", L"DejaVu Sans Mono" }, + { L"MS Sans Serif", L"DejaVu Sans" }, + { L"MS Shell Dlg", L"DejaVu Sans" }, + { L"MS Shell Dlg 2", L"DejaVu Sans" }, + { L"Tahoma", L"DejaVu Sans" }, + { L"Terminal", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"DejaVu Serif" }, + { L"Trebuchet MS", L"Open Sans" }, { NULL, NULL } }; Modified: trunk/reactos/media/fonts/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/CMakeLists.txt… ============================================================================== --- trunk/reactos/media/fonts/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/fonts/CMakeLists.txt [iso-8859-1] Fri Mar 3 22:07:00 2017 @@ -52,6 +52,24 @@ LiberationSerif-BoldItalic.ttf LiberationSerif-Italic.ttf LiberationSerif-Regular.ttf + LibreFranklin-Black.ttf + LibreFranklin-BlackItalic.ttf + LibreFranklin-Bold.ttf + LibreFranklin-BoldItalic.ttf + LibreFranklin-ExtraBold.ttf + LibreFranklin-ExtraBoldItalic.ttf + LibreFranklin-ExtraLight.ttf + LibreFranklin-ExtraLightItalic.ttf + LibreFranklin-Italic.ttf + LibreFranklin-Light.ttf + LibreFranklin-LightItalic.ttf + LibreFranklin-Medium.ttf + LibreFranklin-MediumItalic.ttf + LibreFranklin-Regular.ttf + LibreFranklin-SemiBold.ttf + LibreFranklin-SemiBoldItalic.ttf + LibreFranklin-Thin.ttf + LibreFranklin-ThinItalic.ttf Marlett.ttf OpenSans-Bold.ttf OpenSans-BoldItalic.ttf Added: trunk/reactos/media/fonts/LibreFranklin-Black.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LibreFranklin-… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/LibreFranklin-Black.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/LibreFranklin-BlackItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LibreFranklin-… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/LibreFranklin-BlackItalic.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/LibreFranklin-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LibreFranklin-… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/LibreFranklin-Bold.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/LibreFranklin-BoldItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LibreFranklin-… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/LibreFranklin-BoldItalic.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/LibreFranklin-ExtraBold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LibreFranklin-… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/LibreFranklin-ExtraBold.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/LibreFranklin-ExtraBoldItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LibreFranklin-… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/LibreFranklin-ExtraBoldItalic.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/LibreFranklin-ExtraLight.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LibreFranklin-… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/LibreFranklin-ExtraLight.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/LibreFranklin-ExtraLightItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LibreFranklin-… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/LibreFranklin-ExtraLightItalic.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/LibreFranklin-Italic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LibreFranklin-… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/LibreFranklin-Italic.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/LibreFranklin-Light.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LibreFranklin-… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/LibreFranklin-Light.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/LibreFranklin-LightItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LibreFranklin-… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/LibreFranklin-LightItalic.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/LibreFranklin-Medium.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LibreFranklin-… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/LibreFranklin-Medium.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/LibreFranklin-MediumItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LibreFranklin-… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/LibreFranklin-MediumItalic.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/LibreFranklin-Regular.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LibreFranklin-… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/LibreFranklin-Regular.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/LibreFranklin-SemiBold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LibreFranklin-… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/LibreFranklin-SemiBold.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/LibreFranklin-SemiBoldItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LibreFranklin-… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/LibreFranklin-SemiBoldItalic.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/LibreFranklin-Thin.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LibreFranklin-… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/LibreFranklin-Thin.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/LibreFranklin-ThinItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LibreFranklin-… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/LibreFranklin-ThinItalic.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/doc/LibreFranklin/SIL Open Font License.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/LibreFrank… ============================================================================== --- trunk/reactos/media/fonts/doc/LibreFranklin/SIL Open Font License.txt (added) +++ trunk/reactos/media/fonts/doc/LibreFranklin/SIL Open Font License.txt [iso-8859-1] Fri Mar 3 22:07:00 2017 @@ -0,0 +1,43 @@ +Copyright (c) 2015, Impallari Type (www.impallari.com) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others. + +The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the copyright statement(s). + +"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment. + +"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission. + +5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. Propchange: trunk/reactos/media/fonts/doc/LibreFranklin/SIL Open Font License.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[khornicek] 74039: [SHELL32] - Always set the default value in SetDefaultHandler, otherwise it's impossible to create a default association if the key for some reason already exists. This is consis...
by khornicek＠svn.reactos.org 03 Mar '17

03 Mar '17

Author: khornicek Date: Fri Mar 3 16:20:03 2017 New Revision: 74039 URL: http://svn.reactos.org/svn/reactos?rev=74039&view=rev Log: [SHELL32] - Always set the default value in SetDefaultHandler, otherwise it's impossible to create a default association if the key for some reason already exists. This is consistent with what Windows does. Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp trunk/reactos/dll/win32/shell32/COpenWithMenu.cpp Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefault… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] Fri Mar 3 16:20:03 2017 @@ -1019,7 +1019,7 @@ CDefaultContextMenu::DoDynamicShellExtensions( LPCMINVOKECOMMANDINFO lpcmi) { - TRACE("verb %p first %x last %x", lpcmi->lpVerb, m_iIdSHEFirst, m_iIdSHELast); + TRACE("verb %p first %x last %x\n", lpcmi->lpVerb, m_iIdSHEFirst, m_iIdSHELast); UINT idCmd = LOWORD(lpcmi->lpVerb); PDynamicShellEntry pEntry = GetDynamicEntry(idCmd); Modified: trunk/reactos/dll/win32/shell32/COpenWithMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/COpenWit… ============================================================================== --- trunk/reactos/dll/win32/shell32/COpenWithMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/COpenWithMenu.cpp [iso-8859-1] Fri Mar 3 16:20:03 2017 @@ -684,10 +684,9 @@ BOOL COpenWithList::SetDefaultHandler(SApp *pApp, LPCWSTR pwszFilename) { HKEY hKey, hSrcKey, hDestKey; - DWORD dwDisposition; WCHAR wszBuf[256]; - TRACE("SetDefaultHandler %ls %ls", pApp->wszFilename, pwszFilename); + TRACE("SetDefaultHandler %ls %ls\n", pApp->wszFilename, pwszFilename); /* Extract file extension */ LPCWSTR pwszExt = PathFindExtensionW(pwszFilename); @@ -695,15 +694,18 @@ return FALSE; /* Create file extension key */ - if (RegCreateKeyExW(HKEY_CLASSES_ROOT, pwszExt, 0, NULL, 0, KEY_READ|KEY_WRITE, NULL, &hKey, &dwDisposition) != ERROR_SUCCESS) + if (RegCreateKeyExW(HKEY_CLASSES_ROOT, pwszExt, 0, NULL, 0, KEY_READ|KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) { ERR("Cannot open ext key"); return FALSE; } - if (dwDisposition == REG_CREATED_NEW_KEY) - { - /* A new entry was created create the prog key id */ + DWORD dwSize = sizeof(wszBuf); + LONG lResult = RegGetValueW(hKey, NULL, L"", RRF_RT_REG_SZ, NULL, wszBuf, &dwSize); + + if (lResult == ERROR_FILE_NOT_FOUND) + { + /* A new entry was created or the default key is not set: set the prog key id */ StringCbPrintfW(wszBuf, sizeof(wszBuf), L"%s_auto_file", pwszExt + 1); if (RegSetValueExW(hKey, L"", 0, REG_SZ, (const BYTE*)wszBuf, (wcslen(wszBuf) + 1) * sizeof(WCHAR)) != ERROR_SUCCESS) { @@ -712,16 +714,11 @@ return FALSE; } } - else - { - /* Entry already exists fetch prog key id */ - DWORD dwSize = sizeof(wszBuf); - if (RegGetValueW(hKey, NULL, L"", RRF_RT_REG_SZ, NULL, wszBuf, &dwSize) != ERROR_SUCCESS) - { - ERR("RegGetValueW failed: %lu\n", GetLastError()); - RegCloseKey(hKey); - return FALSE; - } + else if (lResult != ERROR_SUCCESS) + { + RegCloseKey(hKey); + ERR("RegGetValueExW failed: 0x%08x\n", lResult); + return FALSE; } /* Close file extension key */

1 0

[gadamopoulos] 74038: [UXTHEME]: Use SendMessage to notify windows that the theme has changed. This needs a proper test. Makes it possible for SetWindowTheme with empty parameters to have effect im...
by gadamopoulos＠svn.reactos.org 03 Mar '17

03 Mar '17

Author: gadamopoulos Date: Fri Mar 3 14:35:19 2017 New Revision: 74038 URL: http://svn.reactos.org/svn/reactos?rev=74038&view=rev Log: [UXTHEME]: Use SendMessage to notify windows that the theme has changed. This needs a proper test. Makes it possible for SetWindowTheme with empty parameters to have effect immediately in the same way the tests for BCM_GETIDEALSIZE use it. Fixes the BCM_GETIDEALSIZE tests when run with an active theme. Modified: trunk/reactos/dll/win32/uxtheme/system.c Modified: trunk/reactos/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] Fri Mar 3 14:35:19 2017 @@ -57,7 +57,7 @@ static BOOL CALLBACK UXTHEME_broadcast_msg_enumchild (HWND hWnd, LPARAM msg) { - PostMessageW(hWnd, msg, 0, 0); + SendMessageW(hWnd, msg, 0, 0); return TRUE; } @@ -70,7 +70,7 @@ } else { - PostMessageW(hWnd, msg, 0, 0); + SendMessageW(hWnd, msg, 0, 0); EnumChildWindows (hWnd, UXTHEME_broadcast_msg_enumchild, msg); } return TRUE;

1 0

[gadamopoulos] 74037: [COMCTL32]: Fix all tests for BCM_GETIDEALSIZE that we have so far. (It still returns a wrong result for the start button with lautus).
by gadamopoulos＠svn.reactos.org 03 Mar '17

03 Mar '17

Author: gadamopoulos Date: Fri Mar 3 13:56:49 2017 New Revision: 74037 URL: http://svn.reactos.org/svn/reactos?rev=74037&view=rev Log: [COMCTL32]: Fix all tests for BCM_GETIDEALSIZE that we have so far. (It still returns a wrong result for the start button with lautus). Modified: trunk/reactos/dll/win32/comctl32/button.c Modified: trunk/reactos/dll/win32/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/button.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] Fri Mar 3 13:56:49 2017 @@ -315,16 +315,13 @@ WCHAR *text; HFONT hFont = 0, hPrevFont = 0; SIZE TextSize, ImageSize, ButtonSize; + BOOL ret = FALSE; pdata = _GetButtonData(hwnd); text = get_button_text( hwnd ); hdc = GetDC(hwnd); if (!pdata || !text || !hdc || !text[0]) - { - psize->cx = 100; - psize->cy = 100; goto cleanup; - } /* FIXME : Should use GetThemeTextExtent but unfortunately uses DrawTextW which is broken */ if (theme) @@ -381,6 +378,7 @@ } *psize = ButtonSize; + ret = TRUE; cleanup: if (hFont) @@ -390,7 +388,7 @@ if (hdc) ReleaseDC(hwnd, hdc); - return TRUE; + return ret; } #endif @@ -575,17 +573,24 @@ case BCM_GETIDEALSIZE: { HTHEME theme = GetWindowTheme(hWnd); - - if (btn_type != BS_PUSHBUTTON && btn_type != BS_DEFPUSHBUTTON) + BOOL ret = FALSE; + SIZE* pSize = (SIZE*)lParam; + + if (btn_type == BS_PUSHBUTTON || + btn_type == BS_DEFPUSHBUTTON || + btn_type == BS_USERBUTTON) { - SIZE* pSize = (SIZE*)lParam; + ret = BUTTON_GetIdealSize(theme, hWnd, pSize); + } + + if (!ret) + { GetClientRect(hWnd, &rect); pSize->cx = rect.right; pSize->cy = rect.bottom; - return TRUE; } - return BUTTON_GetIdealSize(theme, hWnd, (SIZE*)lParam); + return TRUE; } }

1 0

[gadamopoulos] 74036: [COMCTL32_APITEST]: Simplify tests to not depend on internals of CreateWindow (creating buttons as top level windows and testing their sizes complicates stuff without reason).
by gadamopoulos＠svn.reactos.org 03 Mar '17

03 Mar '17

Author: gadamopoulos Date: Fri Mar 3 13:54:56 2017 New Revision: 74036 URL: http://svn.reactos.org/svn/reactos?rev=74036&view=rev Log: [COMCTL32_APITEST]: Simplify tests to not depend on internals of CreateWindow (creating buttons as top level windows and testing their sizes complicates stuff without reason). Modified: trunk/rostests/apitests/comctl32/button.c Modified: trunk/rostests/apitests/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/comctl32/button.… ============================================================================== --- trunk/rostests/apitests/comctl32/button.c [iso-8859-1] (original) +++ trunk/rostests/apitests/comctl32/button.c [iso-8859-1] Fri Mar 3 13:54:56 2017 @@ -115,7 +115,10 @@ LOGFONTW lf; DWORD i; - hwnd1 = CreateWindowW(L"Button", L" ", 0, 10, 10, 100, 100, 0, NULL, NULL, NULL); + hwnd2 = CreateWindowW(L"Static", L"", 0, 0, 0, 100, 100, 0, NULL, NULL, NULL); + ok (hwnd2 != NULL, "Expected CreateWindowW to succeed\n"); + + hwnd1 = CreateWindowW(L"Button", L" ", WS_CHILD, 10, 10, 100, 100, hwnd2, NULL, NULL, NULL); ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n"); SetWindowTheme(hwnd1, L"", L""); @@ -133,7 +136,7 @@ DestroyWindow(hwnd1); - hwnd1 = CreateWindowW(L"Button", L" ", BS_USERBUTTON, 10, 10, 100, 100, 0, NULL, NULL, NULL); + hwnd1 = CreateWindowW(L"Button", L" ", BS_USERBUTTON | WS_CHILD, 10, 10, 100, 100, hwnd2, NULL, NULL, NULL); ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n"); SetWindowTheme(hwnd1, L"", L""); @@ -147,20 +150,15 @@ - hwnd1 = CreateWindowW(L"Button", L"", 0, 10, 10, 100, 100, 0, NULL, NULL, NULL); - ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n"); - SetWindowTheme(hwnd1, L"", L""); - - memset(&s, 0, sizeof(s)); - ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); - ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); - ok_size(s, 123, 100); + hwnd1 = CreateWindowW(L"Button", L"", WS_CHILD, 10, 10, 100, 100, hwnd2, NULL, NULL, NULL); + ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n"); + SetWindowTheme(hwnd1, L"", L""); s.cx = 1; s.cy = 1; ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); - ok_size(s, 123, 100); + ok_size(s, 100, 100); hbmp = LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(5), IMAGE_BITMAP, 0, 0, 0); ok (hbmp != 0, "Expected LoadImage to succeed\n"); @@ -170,7 +168,7 @@ memset(&s, 0, sizeof(s)); ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); - ok_size(s, 123, 100); + ok_size(s, 100, 100); himl = ImageList_LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(5), 1, 1, 0, IMAGE_BITMAP, 0); ok (himl != 0, "Expected ImageList_LoadImage to succeed\n"); @@ -183,29 +181,29 @@ memset(&s, 0, sizeof(s)); ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); - ok_size(s, 123, 100); - - DestroyWindow(hwnd1); - - - - - - hwnd1 = CreateWindowW(L"Button", L"", 0, 10, 10, 5, 5, 0, NULL, NULL, NULL); - ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n"); - SetWindowTheme(hwnd1, L"", L""); - - memset(&s, 0, sizeof(s)); - ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); - ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); - ok_size(s, 123, 34); - - DestroyWindow(hwnd1); - - - - - hwnd1 = CreateWindowW(L"Button", L" ", BS_BITMAP , 10, 10, 100, 100, 0, NULL, NULL, NULL); + ok_size(s, 100, 100); + + DestroyWindow(hwnd1); + + + + + + hwnd1 = CreateWindowW(L"Button", L"", WS_CHILD, 10, 10, 5, 5, hwnd2, NULL, NULL, NULL); + ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n"); + SetWindowTheme(hwnd1, L"", L""); + + memset(&s, 0, sizeof(s)); + ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); + ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); + ok_size(s, 5, 5); + + DestroyWindow(hwnd1); + + + + + hwnd1 = CreateWindowW(L"Button", L" ", BS_BITMAP | WS_CHILD, 10, 10, 100, 100, hwnd2, NULL, NULL, NULL); ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n"); SetWindowTheme(hwnd1, L"", L""); @@ -223,7 +221,7 @@ - hwnd1 = CreateWindowW(L"Button", L" ", 0, 10, 10, 100, 100, 0, NULL, NULL, NULL); + hwnd1 = CreateWindowW(L"Button", L" ", WS_CHILD, 10, 10, 100, 100, hwnd2, NULL, NULL, NULL); ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n"); SetWindowTheme(hwnd1, L"", L""); @@ -302,7 +300,7 @@ - hwnd1 = CreateWindowW(L"Button", L"Start", BS_VCENTER, 0, 0, 0, 0, 0, NULL, NULL, NULL); + hwnd1 = CreateWindowW(L"Button", L"Start", BS_VCENTER | WS_CHILD, 0, 0, 0, 0, hwnd2, NULL, NULL, NULL); ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n"); SetWindowTheme(hwnd1, L"", L""); @@ -326,7 +324,7 @@ /* Test again with some real text to see if the formula is correct */ - hwnd1 = CreateWindowW(L"Button", L"Some test text", 0, 10, 10, 100, 100, 0, NULL, NULL, NULL); + hwnd1 = CreateWindowW(L"Button", L"Some test text", WS_CHILD, 10, 10, 100, 100, hwnd2, NULL, NULL, NULL); ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n"); SetWindowTheme(hwnd1, L"", L""); @@ -361,53 +359,53 @@ DestroyWindow(hwnd1); - hwnd1 = CreateWindowW(L"Static", L"", 0, 0, 0, 100, 100, 0, NULL, NULL, NULL); - ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n"); - - for (i = BS_CHECKBOX; i <= BS_OWNERDRAW; i++) + for (i = BS_PUSHBUTTON; i <= BS_OWNERDRAW; i++) { if (i == BS_USERBUTTON) continue; - hwnd2 = CreateWindowW(L"Button", L" ", i, 0, 0, 72, 72, hwnd1, NULL, NULL, NULL); - ok (hwnd2 != NULL, "Expected CreateWindowW to succeed\n"); + if (i >= BS_CHECKBOX) + { + hwnd1 = CreateWindowW(L"Button", L" ", i|WS_CHILD, 0, 0, 72, 72, hwnd2, NULL, NULL, NULL); + ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n"); + memset(&s, 0, sizeof(s)); + ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); + ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); + ok_size(s, 72, 72); + + SetWindowTheme(hwnd1, L"", L""); + memset(&s, 0, sizeof(s)); + ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); + ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); + ok_size(s, 72, 72); + DestroyWindow(hwnd1); + + hwnd1 = CreateWindowW(L"Button", L" ", i|WS_CHILD, 0, 0, 12, 12, hwnd2, NULL, NULL, NULL); + ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n"); + memset(&s, 0, sizeof(s)); + ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); + ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); + ok_size(s, 12, 12); + DestroyWindow(hwnd1); + } + + hwnd1 = CreateWindowW(L"Button", L"", i|WS_CHILD, 0, 0, 72, 72, hwnd2, NULL, NULL, NULL); + ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n"); memset(&s, 0, sizeof(s)); - ret = SendMessageW(hwnd2, BCM_GETIDEALSIZE, 0, (LPARAM)&s); + ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); - ok_size(s, 123, 72); - - SetWindowTheme(hwnd2, L"", L""); + ok_size(s, 72, 72); + DestroyWindow(hwnd1); + + hwnd1 = CreateWindowW(L"Button", L"", i|WS_CHILD, 0, 0, 150, 72, hwnd2, NULL, NULL, NULL); + ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n"); memset(&s, 0, sizeof(s)); - ret = SendMessageW(hwnd2, BCM_GETIDEALSIZE, 0, (LPARAM)&s); - ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); - ok_size(s, 123, 72); - DestroyWindow(hwnd2); - - hwnd2 = CreateWindowW(L"Button", L" ", i, 0, 0, 12, 12, hwnd1, NULL, NULL, NULL); - ok (hwnd2 != NULL, "Expected CreateWindowW to succeed\n"); - memset(&s, 0, sizeof(s)); - ret = SendMessageW(hwnd2, BCM_GETIDEALSIZE, 0, (LPARAM)&s); - ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); - ok_size(s, 123, 34); - DestroyWindow(hwnd2); - - hwnd2 = CreateWindowW(L"Button", L"", i, 0, 0, 72, 72, hwnd1, NULL, NULL, NULL); - ok (hwnd2 != NULL, "Expected CreateWindowW to succeed\n"); - memset(&s, 0, sizeof(s)); - ret = SendMessageW(hwnd2, BCM_GETIDEALSIZE, 0, (LPARAM)&s); - ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); - ok_size(s, 123, 72); - DestroyWindow(hwnd2); - - hwnd2 = CreateWindowW(L"Button", L"", i, 0, 0, 150, 72, hwnd1, NULL, NULL, NULL); - ok (hwnd2 != NULL, "Expected CreateWindowW to succeed\n"); - memset(&s, 0, sizeof(s)); - ret = SendMessageW(hwnd2, BCM_GETIDEALSIZE, 0, (LPARAM)&s); + ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); ok_size(s, 150, 72); - DestroyWindow(hwnd2); + DestroyWindow(hwnd1); } - DestroyWindow(hwnd1); + DestroyWindow(hwnd2); } START_TEST(button)

1 0

[gadamopoulos] 74035: [COMCTL32_APITEST]: Add a few more tests.
by gadamopoulos＠svn.reactos.org 03 Mar '17

03 Mar '17

Author: gadamopoulos Date: Fri Mar 3 11:30:06 2017 New Revision: 74035 URL: http://svn.reactos.org/svn/reactos?rev=74035&view=rev Log: [COMCTL32_APITEST]: Add a few more tests. Modified: trunk/rostests/apitests/comctl32/button.c Modified: trunk/rostests/apitests/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/comctl32/button.… ============================================================================== --- trunk/rostests/apitests/comctl32/button.c [iso-8859-1] (original) +++ trunk/rostests/apitests/comctl32/button.c [iso-8859-1] Fri Mar 3 11:30:06 2017 @@ -398,6 +398,14 @@ ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); ok_size(s, 123, 72); DestroyWindow(hwnd2); + + hwnd2 = CreateWindowW(L"Button", L"", i, 0, 0, 150, 72, hwnd1, NULL, NULL, NULL); + ok (hwnd2 != NULL, "Expected CreateWindowW to succeed\n"); + memset(&s, 0, sizeof(s)); + ret = SendMessageW(hwnd2, BCM_GETIDEALSIZE, 0, (LPARAM)&s); + ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); + ok_size(s, 150, 72); + DestroyWindow(hwnd2); } DestroyWindow(hwnd1); }

1 0

[gadamopoulos] 74034: [COMCTL32_APITEST]: Make some tests more strict and add tests for all button types.
by gadamopoulos＠svn.reactos.org 03 Mar '17

03 Mar '17

Author: gadamopoulos Date: Fri Mar 3 11:22:20 2017 New Revision: 74034 URL: http://svn.reactos.org/svn/reactos?rev=74034&view=rev Log: [COMCTL32_APITEST]: Make some tests more strict and add tests for all button types. Modified: trunk/rostests/apitests/comctl32/button.c Modified: trunk/rostests/apitests/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/comctl32/button.… ============================================================================== --- trunk/rostests/apitests/comctl32/button.c [iso-8859-1] (original) +++ trunk/rostests/apitests/comctl32/button.c [iso-8859-1] Fri Mar 3 11:22:20 2017 @@ -11,7 +11,7 @@ #include <uxtheme.h> #define ok_rect(rc, l,r,t,b) ok((rc.left == (l)) && (rc.right == (r)) && (rc.top == (t)) && (rc.bottom == (b)), "Wrong rect. expected %d, %d, %d, %d got %ld, %ld, %ld, %ld\n", l,t,r,b, rc.left, rc.top, rc.right, rc.bottom) -#define ok_size(s, width, height) ok((s.cx == (width) && s.cy == (height)), "Expected size (%lu,%lu) got (%lu,%lu)\n", width, height, s.cx, s.cy) +#define ok_size(s, width, height) ok((s.cx == (width) && s.cy == (height)), "Expected size (%lu,%lu) got (%lu,%lu)\n", (LONG)width, (LONG)height, s.cx, s.cy) void Test_TextMargin() { @@ -52,6 +52,17 @@ ok_rect(rc, 1000, 1000, 1000, 1000); DestroyWindow(hwnd1); + + hwnd1 = CreateWindowW(L"Button", L"Test1", BS_DEFPUSHBUTTON, 10, 10, 100, 100, 0, NULL, NULL, NULL); + ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n"); + SetWindowTheme(hwnd1, L"", L""); + + ret = SendMessageW(hwnd1, BCM_GETTEXTMARGIN, 0, (LPARAM)&rc); + ok (ret == TRUE, "Expected BCM_GETTEXTMARGIN to succeed\n"); + ok_rect(rc, 1, 1, 1, 1); + + DestroyWindow(hwnd1); + } void Test_Imagelist() @@ -92,7 +103,7 @@ void Test_GetIdealSizeNoThemes() { - HWND hwnd1; + HWND hwnd1, hwnd2; BOOL ret; SIZE s, textent; HFONT font; @@ -102,6 +113,7 @@ BUTTON_IMAGELIST imlData; RECT rc; LOGFONTW lf; + DWORD i; hwnd1 = CreateWindowW(L"Button", L" ", 0, 10, 10, 100, 100, 0, NULL, NULL, NULL); ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n"); @@ -121,6 +133,18 @@ DestroyWindow(hwnd1); + hwnd1 = CreateWindowW(L"Button", L" ", BS_USERBUTTON, 10, 10, 100, 100, 0, NULL, NULL, NULL); + ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n"); + SetWindowTheme(hwnd1, L"", L""); + + memset(&s, 0, sizeof(s)); + ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); + ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); + ok_size(s, textent.cx + 5 + 2, + textent.cy + 7 + 2); /* the last +2 is the text margin */ + + DestroyWindow(hwnd1); + hwnd1 = CreateWindowW(L"Button", L"", 0, 10, 10, 100, 100, 0, NULL, NULL, NULL); @@ -130,15 +154,13 @@ memset(&s, 0, sizeof(s)); ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); - ok (s.cx > 80, "Expected big cx\n"); - ok (s.cy > 80, "Expected big cy\n"); + ok_size(s, 123, 100); s.cx = 1; s.cy = 1; ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); - ok (s.cx > 80, "Expected big cx\n"); - ok (s.cy > 80, "Expected big cy\n"); + ok_size(s, 123, 100); hbmp = LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(5), IMAGE_BITMAP, 0, 0, 0); ok (hbmp != 0, "Expected LoadImage to succeed\n"); @@ -148,8 +170,7 @@ memset(&s, 0, sizeof(s)); ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); - ok (s.cx > 80, "Expected big cx\n"); - ok (s.cy > 80, "Expected big cy\n"); + ok_size(s, 123, 100); himl = ImageList_LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(5), 1, 1, 0, IMAGE_BITMAP, 0); ok (himl != 0, "Expected ImageList_LoadImage to succeed\n"); @@ -162,8 +183,22 @@ memset(&s, 0, sizeof(s)); ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); - ok (s.cx > 80, "Expected big cx\n"); - ok (s.cy > 80, "Expected big cy\n"); + ok_size(s, 123, 100); + + DestroyWindow(hwnd1); + + + + + + hwnd1 = CreateWindowW(L"Button", L"", 0, 10, 10, 5, 5, 0, NULL, NULL, NULL); + ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n"); + SetWindowTheme(hwnd1, L"", L""); + + memset(&s, 0, sizeof(s)); + ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s); + ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); + ok_size(s, 123, 34); DestroyWindow(hwnd1); @@ -326,9 +361,45 @@ DestroyWindow(hwnd1); - - - + hwnd1 = CreateWindowW(L"Static", L"", 0, 0, 0, 100, 100, 0, NULL, NULL, NULL); + ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n"); + + for (i = BS_CHECKBOX; i <= BS_OWNERDRAW; i++) + { + if (i == BS_USERBUTTON) + continue; + + hwnd2 = CreateWindowW(L"Button", L" ", i, 0, 0, 72, 72, hwnd1, NULL, NULL, NULL); + ok (hwnd2 != NULL, "Expected CreateWindowW to succeed\n"); + memset(&s, 0, sizeof(s)); + ret = SendMessageW(hwnd2, BCM_GETIDEALSIZE, 0, (LPARAM)&s); + ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); + ok_size(s, 123, 72); + + SetWindowTheme(hwnd2, L"", L""); + memset(&s, 0, sizeof(s)); + ret = SendMessageW(hwnd2, BCM_GETIDEALSIZE, 0, (LPARAM)&s); + ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); + ok_size(s, 123, 72); + DestroyWindow(hwnd2); + + hwnd2 = CreateWindowW(L"Button", L" ", i, 0, 0, 12, 12, hwnd1, NULL, NULL, NULL); + ok (hwnd2 != NULL, "Expected CreateWindowW to succeed\n"); + memset(&s, 0, sizeof(s)); + ret = SendMessageW(hwnd2, BCM_GETIDEALSIZE, 0, (LPARAM)&s); + ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); + ok_size(s, 123, 34); + DestroyWindow(hwnd2); + + hwnd2 = CreateWindowW(L"Button", L"", i, 0, 0, 72, 72, hwnd1, NULL, NULL, NULL); + ok (hwnd2 != NULL, "Expected CreateWindowW to succeed\n"); + memset(&s, 0, sizeof(s)); + ret = SendMessageW(hwnd2, BCM_GETIDEALSIZE, 0, (LPARAM)&s); + ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n"); + ok_size(s, 123, 72); + DestroyWindow(hwnd2); + } + DestroyWindow(hwnd1); } START_TEST(button)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs