Ros-diffs August 2016

ros-diffs@reactos.org

20 participants
462 discussions

[akhaldi] 72278: [DBGHELP] Sync with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: akhaldi Date: Thu Aug 18 10:04:21 2016 New Revision: 72278 URL: http://svn.reactos.org/svn/reactos?rev=72278&view=rev Log: [DBGHELP] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/dll/win32/dbghelp/dwarf.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/dbghelp/dwarf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dwarf.c?… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dwarf.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dwarf.c [iso-8859-1] Thu Aug 18 10:04:21 2016 @@ -430,6 +430,7 @@ switch (abbrev_attr->form) { + case DW_FORM_flag_present: step = 0; break; case DW_FORM_ref_addr: case DW_FORM_addr: step = ctx->word_size; break; case DW_FORM_flag: @@ -475,6 +476,11 @@ case DW_FORM_flag: attr->u.uvalue = dwarf2_get_byte(data); TRACE("flag<0x%lx>\n", attr->u.uvalue); + break; + + case DW_FORM_flag_present: + attr->u.uvalue = 1; + TRACE("flag_present\n"); break; case DW_FORM_data1: Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Aug 18 10:04:21 2016 @@ -63,7 +63,7 @@ reactos/dll/win32/cryptdll # Synced to WineStaging-1.9.11 reactos/dll/win32/cryptnet # Synced to WineStaging-1.9.11 reactos/dll/win32/cryptui # Synced to WineStaging-1.9.16 -reactos/dll/win32/dbghelp # Synced to WineStaging-1.9.11 +reactos/dll/win32/dbghelp # Synced to WineStaging-1.9.16 reactos/dll/win32/dciman32 # Synced to WineStaging-1.9.11 reactos/dll/win32/faultrep # Synced to WineStaging-1.9.11 reactos/dll/win32/fontsub # Synced to WineStaging-1.9.13

1 0

[akhaldi] 72277: [CRYPTUI] Sync with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: akhaldi Date: Thu Aug 18 10:03:16 2016 New Revision: 72277 URL: http://svn.reactos.org/svn/reactos?rev=72277&view=rev Log: [CRYPTUI] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/dll/win32/cryptui/main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/cryptui/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/cryptui/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/main.c [iso-8859-1] Thu Aug 18 10:03:16 2016 @@ -1796,16 +1796,16 @@ static void add_icon_to_control(HWND hwnd, int id) { HRESULT hr; - LPRICHEDITOLE richEditOle = NULL; - LPOLEOBJECT object = NULL; + IRichEditOle *richEditOle = NULL; + IOleObject *object = NULL; CLSID clsid; LPOLECACHE oleCache = NULL; FORMATETC formatEtc; DWORD conn; - LPDATAOBJECT dataObject = NULL; + IDataObject *dataObject = NULL; HBITMAP bitmap = NULL; STGMEDIUM stgm; - LPOLECLIENTSITE clientSite = NULL; + IOleClientSite *clientSite = NULL; REOBJECT reObject; TRACE("(%p, %d)\n", hwnd, id); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Aug 18 10:03:16 2016 @@ -62,7 +62,7 @@ reactos/dll/win32/cryptdlg # Synced to WineStaging-1.9.11 reactos/dll/win32/cryptdll # Synced to WineStaging-1.9.11 reactos/dll/win32/cryptnet # Synced to WineStaging-1.9.11 -reactos/dll/win32/cryptui # Synced to WineStaging-1.9.11 +reactos/dll/win32/cryptui # Synced to WineStaging-1.9.16 reactos/dll/win32/dbghelp # Synced to WineStaging-1.9.11 reactos/dll/win32/dciman32 # Synced to WineStaging-1.9.11 reactos/dll/win32/faultrep # Synced to WineStaging-1.9.11

1 0

[akhaldi] 72276: [CRYPT32] Sync with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: akhaldi Date: Thu Aug 18 10:01:42 2016 New Revision: 72276 URL: http://svn.reactos.org/svn/reactos?rev=72276&view=rev Log: [CRYPT32] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/dll/win32/crypt32/collectionstore.c trunk/reactos/dll/win32/crypt32/proplist.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/crypt32/collectionstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/collecti… ============================================================================== --- trunk/reactos/dll/win32/crypt32/collectionstore.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/collectionstore.c [iso-8859-1] Thu Aug 18 10:01:42 2016 @@ -110,10 +110,10 @@ } else { - WINE_STORE_LIST_ENTRY *entry, *next; + WINE_STORE_LIST_ENTRY *entry; EnterCriticalSection(&store->cs); - LIST_FOR_EACH_ENTRY_SAFE(entry, next, &store->stores, WINE_STORE_LIST_ENTRY, entry) + LIST_FOR_EACH_ENTRY(entry, &store->stores, WINE_STORE_LIST_ENTRY, entry) { if (entry->dwUpdateFlags & CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG) { @@ -555,7 +555,7 @@ { WINE_COLLECTIONSTORE *collection = hCollectionStore; WINECRYPT_CERTSTORE *sibling = hSiblingStore; - WINE_STORE_LIST_ENTRY *store, *next; + WINE_STORE_LIST_ENTRY *store; TRACE("(%p, %p)\n", hCollectionStore, hSiblingStore); @@ -574,8 +574,7 @@ return; } EnterCriticalSection(&collection->cs); - LIST_FOR_EACH_ENTRY_SAFE(store, next, &collection->stores, - WINE_STORE_LIST_ENTRY, entry) + LIST_FOR_EACH_ENTRY(store, &collection->stores, WINE_STORE_LIST_ENTRY, entry) { if (store->store == sibling) { Modified: trunk/reactos/dll/win32/crypt32/proplist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/proplist… ============================================================================== --- trunk/reactos/dll/win32/crypt32/proplist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/proplist.c [iso-8859-1] Thu Aug 18 10:01:42 2016 @@ -142,11 +142,10 @@ void ContextPropertyList_RemoveProperty(CONTEXT_PROPERTY_LIST *list, DWORD id) { - CONTEXT_PROPERTY *prop, *next; + CONTEXT_PROPERTY *prop; EnterCriticalSection(&list->cs); - LIST_FOR_EACH_ENTRY_SAFE(prop, next, &list->properties, CONTEXT_PROPERTY, - entry) + LIST_FOR_EACH_ENTRY(prop, &list->properties, CONTEXT_PROPERTY, entry) { if (prop->propID == id) { Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Aug 18 10:01:42 2016 @@ -58,7 +58,7 @@ reactos/dll/win32/comdlg32 # Synced to WineStaging-1.9.11 reactos/dll/win32/compstui # Synced to WineStaging-1.9.11 reactos/dll/win32/credui # Synced to WineStaging-1.9.16 -reactos/dll/win32/crypt32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/crypt32 # Synced to WineStaging-1.9.16 reactos/dll/win32/cryptdlg # Synced to WineStaging-1.9.11 reactos/dll/win32/cryptdll # Synced to WineStaging-1.9.11 reactos/dll/win32/cryptnet # Synced to WineStaging-1.9.11

1 0

[akhaldi] 72275: [CREDUI] Sync with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: akhaldi Date: Thu Aug 18 10:00:07 2016 New Revision: 72275 URL: http://svn.reactos.org/svn/reactos?rev=72275&view=rev Log: [CREDUI] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/dll/win32/credui/credui.spec trunk/reactos/dll/win32/credui/credui_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/credui/credui.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui.sp… ============================================================================== --- trunk/reactos/dll/win32/credui/credui.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui.spec [iso-8859-1] Thu Aug 18 10:00:07 2016 @@ -1,3 +1,4 @@ +@ stdcall CredPackAuthenticationBufferW(long wstr ptr ptr ptr) @ stub CredUICmdLinePromptForCredentialsA @ stub CredUICmdLinePromptForCredentialsW @ stub CredUIConfirmCredentialsA @@ -7,10 +8,12 @@ @ stdcall CredUIParseUserNameW(wstr ptr long ptr long) @ stub CredUIPromptForCredentialsA @ stdcall CredUIPromptForCredentialsW(ptr wstr ptr long ptr long ptr long ptr long) +@ stdcall CredUIPromptForWindowsCredentialsW(ptr long ptr ptr long ptr ptr ptr long) @ stdcall CredUIReadSSOCredA(str ptr) @ stdcall CredUIReadSSOCredW(wstr ptr) @ stdcall CredUIStoreSSOCredA(str str str long) @ stdcall CredUIStoreSSOCredW(wstr wstr wstr long) +@ stdcall CredUnPackAuthenticationBufferW(long ptr long ptr ptr ptr ptr ptr ptr) @ stub -private DllCanUnloadNow @ stub -private DllGetClassObject @ stub -private DllRegisterServer Modified: trunk/reactos/dll/win32/credui/credui_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_ma… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui_main.c [iso-8859-1] Thu Aug 18 10:00:07 2016 @@ -872,6 +872,7 @@ DWORD len_password = sizeof(password) / sizeof(password[0]); DWORD ret, flags; CREDUI_INFOW *cred_info = info; + SEC_WINNT_AUTH_IDENTITY_W *id = input_id; FIXME( "(%s, %p, %u, %s, %p, %p, %p, %x) stub\n", debugstr_w(target), info, error, debugstr_w(package), input_id, output_id, save, sspi_flags ); @@ -883,11 +884,6 @@ FIXME( "package %s not supported\n", debugstr_w(package) ); return ERROR_NO_SUCH_PACKAGE; } - if (input_id) - { - FIXME( "input identity not supported\n" ); - return ERROR_CALL_NOT_IMPLEMENTED; - } flags = CREDUI_FLAGS_ALWAYS_SHOW_UI | CREDUI_FLAGS_GENERIC_CREDENTIALS; @@ -897,12 +893,24 @@ if (!(sspi_flags & SSPIPFC_NO_CHECKBOX)) flags |= CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX; - find_existing_credential( target, username, len_username, password, len_password ); + if (!id) find_existing_credential( target, username, len_username, password, len_password ); + else + { + if (id->User && id->UserLength > 0 && id->UserLength <= CREDUI_MAX_USERNAME_LENGTH) + { + memcpy( username, id->User, id->UserLength * sizeof(WCHAR) ); + username[id->UserLength] = 0; + } + if (id->Password && id->PasswordLength > 0 && id->PasswordLength <= CREDUI_MAX_PASSWORD_LENGTH) + { + memcpy( password, id->Password, id->PasswordLength * sizeof(WCHAR) ); + password[id->PasswordLength] = 0; + } + } if (!(ret = CredUIPromptForCredentialsW( cred_info, target, NULL, error, username, len_username, password, len_password, save, flags ))) { - SEC_WINNT_AUTH_IDENTITY_W *id; DWORD size = sizeof(*id); WCHAR *ptr; @@ -930,3 +938,37 @@ return ret; } + +/****************************************************************************** + * CredUIPromptForWindowsCredentialsW [CREDUI.@] + */ +DWORD WINAPI CredUIPromptForWindowsCredentialsW( CREDUI_INFOW *info, DWORD error, ULONG *package, + const void *in_buf, ULONG in_buf_size, void **out_buf, + ULONG *out_buf_size, BOOL *save, DWORD flags ) +{ + FIXME( "(%p, %u, %p, %p, %u, %p, %p, %p, %08x) stub\n", info, error, package, in_buf, in_buf_size, + out_buf, out_buf_size, save, flags ); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * CredPackAuthenticationBufferW [CREDUI.@] + */ +BOOL WINAPI CredPackAuthenticationBufferW( DWORD flags, WCHAR *username, WCHAR *password, BYTE *buf, + DWORD *size ) +{ + FIXME( "(%08x, %s, %p, %p, %p) stub\n", flags, debugstr_w(username), password, buf, size ); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * CredUnPackAuthenticationBufferW [CREDUI.@] + */ +BOOL WINAPI CredUnPackAuthenticationBufferW( DWORD flags, void *buf, DWORD size, WCHAR *username, + DWORD *len_username, WCHAR *domain, DWORD *len_domain, + WCHAR *password, DWORD *len_password ) +{ + FIXME( "(%08x, %p, %u, %p, %p, %p, %p, %p, %p) stub\n", flags, buf, size, username, len_username, + domain, len_domain, password, len_password ); + return ERROR_CALL_NOT_IMPLEMENTED; +} Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Aug 18 10:00:07 2016 @@ -57,7 +57,7 @@ reactos/dll/win32/comctl32 # Synced to WineStaging-1.9.11 reactos/dll/win32/comdlg32 # Synced to WineStaging-1.9.11 reactos/dll/win32/compstui # Synced to WineStaging-1.9.11 -reactos/dll/win32/credui # Synced to WineStaging-1.9.11 +reactos/dll/win32/credui # Synced to WineStaging-1.9.16 reactos/dll/win32/crypt32 # Synced to WineStaging-1.9.11 reactos/dll/win32/cryptdlg # Synced to WineStaging-1.9.11 reactos/dll/win32/cryptdll # Synced to WineStaging-1.9.11

1 0

[akhaldi] 72274: [CABINET] Sync with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: akhaldi Date: Thu Aug 18 09:58:31 2016 New Revision: 72274 URL: http://svn.reactos.org/svn/reactos?rev=72274&view=rev Log: [CABINET] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/dll/win32/cabinet/cabinet_main.c trunk/reactos/dll/win32/cabinet/fdi.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/cabinet/cabinet_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet_… ============================================================================== --- trunk/reactos/dll/win32/cabinet/cabinet_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/cabinet_main.c [iso-8859-1] Thu Aug 18 09:58:31 2016 @@ -319,7 +319,7 @@ HFDI hfdi; char *str, *end, *path = NULL, *name = NULL; - TRACE("(%p, %s)\n", dest, szCabName); + TRACE("(%p, %s)\n", dest, debugstr_a(szCabName)); hfdi = FDICreate(mem_alloc, mem_free, Modified: trunk/reactos/dll/win32/cabinet/fdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fdi.c?re… ============================================================================== --- trunk/reactos/dll/win32/cabinet/fdi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/fdi.c [iso-8859-1] Thu Aug 18 09:58:31 2016 @@ -2571,7 +2571,7 @@ * where all the cabinet files needed for decryption are simultaneously * available. But presumably, the API is supposed to support cabinets which * are split across multiple CDROMS; we may need to change our implementation - * to strictly serialize it's file usage so that it opens only one cabinet + * to strictly serialize its file usage so that it opens only one cabinet * at a time. Some experimentation with Windows is needed to figure out the * precise semantics required. The relevant code is here and in fdi_decomp(). */ @@ -2602,8 +2602,8 @@ * if we imagine parallelized access to the FDICopy API. * * The current implementation punts -- it just returns the previous cabinet and - * it's info from the header of this cabinet. This provides the right answer in - * 95% of the cases; its worth checking if Microsoft cuts the same corner before + * its info from the header of this cabinet. This provides the right answer in + * 95% of the cases; it's worth checking if Microsoft cuts the same corner before * we "fix" it. */ ZeroMemory(&fdin, sizeof(FDINOTIFICATION)); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Aug 18 09:58:31 2016 @@ -51,7 +51,7 @@ reactos/dll/win32/avifil32 # Synced to WineStaging-1.9.16 reactos/dll/win32/bcrypt # Synced to WineStaging-1.9.4 reactos/dll/win32/browseui # Out of sync -reactos/dll/win32/cabinet # Synced to WineStaging-1.9.11 +reactos/dll/win32/cabinet # Synced to WineStaging-1.9.16 reactos/dll/win32/clusapi # Synced to WineStaging-1.9.11 reactos/dll/win32/comcat # Synced to WineStaging-1.9.11 reactos/dll/win32/comctl32 # Synced to WineStaging-1.9.11

1 0

[akhaldi] 72273: [AVIFIL32_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: akhaldi Date: Thu Aug 18 09:56:44 2016 New Revision: 72273 URL: http://svn.reactos.org/svn/reactos?rev=72273&view=rev Log: [AVIFIL32_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/rostests/winetests/avifil32/api.c Modified: trunk/rostests/winetests/avifil32/api.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/avifil32/api.c?… ============================================================================== --- trunk/rostests/winetests/avifil32/api.c [iso-8859-1] (original) +++ trunk/rostests/winetests/avifil32/api.c [iso-8859-1] Thu Aug 18 09:56:44 2016 @@ -709,6 +709,35 @@ while (IAVIFile_Release(avif)); } +static void test_COM_editstream(void) +{ + IAVIEditStream *edit; + IAVIStream *stream; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* Same refcount for all AVIEditStream interfaces */ + hr = CreateEditableStream(&stream, NULL); + ok(hr == S_OK, "AVIEditStream create failed: %08x, expected S_OK\n", hr); + refcount = IAVIStream_AddRef(stream); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IAVIStream_QueryInterface(stream, &IID_IAVIEditStream, (void**)&edit); + ok(hr == S_OK, "QueryInterface for IID_IAVIEditStream failed: %08x\n", hr); + refcount = IAVIEditStream_AddRef(edit); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IAVIEditStream_Release(edit); + + hr = IAVIEditStream_QueryInterface(edit, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + IUnknown_Release(unk); + + while (IAVIEditStream_Release(edit)); +} + START_TEST(api) { @@ -721,6 +750,7 @@ test_ash1_corruption2(); test_COM(); test_COM_wavfile(); + test_COM_editstream(); AVIFileExit(); }

1 0

[akhaldi] 72272: [AVIFIL32] Sync with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: akhaldi Date: Thu Aug 18 09:55:39 2016 New Revision: 72272 URL: http://svn.reactos.org/svn/reactos?rev=72272&view=rev Log: [AVIFIL32] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/dll/win32/avifil32/api.c trunk/reactos/dll/win32/avifil32/avifile_private.h trunk/reactos/dll/win32/avifil32/editstream.c trunk/reactos/dll/win32/avifil32/factory.c trunk/reactos/dll/win32/avifil32/tmpfile.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/avifil32/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/api.c?r… ============================================================================== --- trunk/reactos/dll/win32/avifil32/api.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/api.c [iso-8859-1] Thu Aug 18 09:55:39 2016 @@ -1960,44 +1960,6 @@ } /*********************************************************************** - * CreateEditableStream (AVIFIL32.@) - */ -HRESULT WINAPI CreateEditableStream(PAVISTREAM *ppEditable, PAVISTREAM pSource) -{ - IAVIEditStream *pEdit = NULL; - HRESULT hr; - - TRACE("(%p,%p)\n", ppEditable, pSource); - - if (ppEditable == NULL) - return AVIERR_BADPARAM; - - *ppEditable = NULL; - - if (pSource != NULL) { - hr = IAVIStream_QueryInterface(pSource, &IID_IAVIEditStream, - (LPVOID*)&pEdit); - if (SUCCEEDED(hr) && pEdit != NULL) { - hr = IAVIEditStream_Clone(pEdit, ppEditable); - IAVIEditStream_Release(pEdit); - - return hr; - } - } - - /* need own implementation of IAVIEditStream */ - pEdit = AVIFILE_CreateEditStream(pSource); - if (pEdit == NULL) - return AVIERR_MEMORY; - - hr = IAVIEditStream_QueryInterface(pEdit, &IID_IAVIStream, - (LPVOID*)ppEditable); - IAVIEditStream_Release(pEdit); - - return hr; -} - -/*********************************************************************** * EditStreamClone (AVIFIL32.@) */ HRESULT WINAPI EditStreamClone(PAVISTREAM pStream, PAVISTREAM *ppResult) Modified: trunk/reactos/dll/win32/avifil32/avifile_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_private.h [iso-8859-1] Thu Aug 18 09:55:39 2016 @@ -65,7 +65,6 @@ extern HRESULT AVIFILE_CreateWAVFile(IUnknown *outer_unk, REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; extern HRESULT AVIFILE_CreateACMStream(REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; extern HRESULT AVIFILE_CreateICMStream(REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; -extern PAVIEDITSTREAM AVIFILE_CreateEditStream(PAVISTREAM pstream) DECLSPEC_HIDDEN; extern PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pstream) DECLSPEC_HIDDEN; extern PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/avifil32/editstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/editstr… ============================================================================== --- trunk/reactos/dll/win32/avifil32/editstream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/editstream.c [iso-8859-1] Thu Aug 18 09:55:39 2016 @@ -52,6 +52,8 @@ PGETFRAME pg; /* IGetFrame for pCurStream */ LPBITMAPINFOHEADER lpFrame; /* frame of pCurStream */ }; + +static IAVIEditStreamImpl *AVIFILE_CreateEditStream(IAVIStream *stream); static inline IAVIEditStreamImpl *impl_from_IAVIEditStream(IAVIEditStream *iface) { @@ -381,15 +383,15 @@ *(LPDWORD)plLength = This->sInfo.dwStart + This->sInfo.dwLength - *(LPDWORD)plStart; - pEdit = (IAVIEditStreamImpl*)AVIFILE_CreateEditStream(NULL); + pEdit = AVIFILE_CreateEditStream(NULL); if (pEdit == NULL) return AVIERR_MEMORY; - hr = IAVIEditStream_Paste((PAVIEDITSTREAM)pEdit, &start, plLength, &This->IAVIStream_iface, + hr = IAVIEditStream_Paste(&pEdit->IAVIEditStream_iface, &start, plLength, &This->IAVIStream_iface, *plStart, *plStart + *plLength); *plStart = start; if (FAILED(hr)) - IAVIEditStream_Release((PAVIEDITSTREAM)pEdit); + IAVIEditStream_Release(&pEdit->IAVIEditStream_iface); else *ppResult = &This->IAVIStream_iface; @@ -597,7 +599,7 @@ return AVIERR_BADPARAM; *ppResult = NULL; - pEdit = (IAVIEditStreamImpl*)AVIFILE_CreateEditStream(NULL); + pEdit = AVIFILE_CreateEditStream(NULL); if (pEdit == NULL) return AVIERR_MEMORY; if (This->nStreams > pEdit->nTableSize) { @@ -638,7 +640,7 @@ This->sInfo.dwRate = asi->dwRate; This->sInfo.dwScale = asi->dwScale; This->sInfo.dwQuality = asi->dwQuality; - CopyRect(&This->sInfo.rcFrame, &asi->rcFrame); + This->sInfo.rcFrame = asi->rcFrame; memcpy(This->sInfo.szName, asi->szName, sizeof(asi->szName)); This->sInfo.dwEditCount++; @@ -988,7 +990,7 @@ IEditAVIStream_fnSetInfo }; -PAVIEDITSTREAM AVIFILE_CreateEditStream(PAVISTREAM pstream) +static IAVIEditStreamImpl *AVIFILE_CreateEditStream(IAVIStream *pstream) { IAVIEditStreamImpl *pedit = NULL; @@ -1002,5 +1004,39 @@ IAVIStream_Create(&pedit->IAVIStream_iface, (LPARAM)pstream, 0); - return (PAVIEDITSTREAM)pedit; -} + return pedit; +} + +/*********************************************************************** + * CreateEditableStream (AVIFIL32.@) + */ +HRESULT WINAPI CreateEditableStream(IAVIStream **editable, IAVIStream *src) +{ + IAVIEditStream *edit = NULL; + IAVIEditStreamImpl *editobj; + HRESULT hr; + + TRACE("(%p,%p)\n", editable, src); + + if (!editable) + return AVIERR_BADPARAM; + *editable = NULL; + + if (src) { + hr = IAVIStream_QueryInterface(src, &IID_IAVIEditStream, (void**)&edit); + if (SUCCEEDED(hr) && edit) { + hr = IAVIEditStream_Clone(edit, editable); + IAVIEditStream_Release(edit); + + return hr; + } + } + + /* Need own implementation of IAVIEditStream */ + editobj = AVIFILE_CreateEditStream(src); + if (!editobj) + return AVIERR_MEMORY; + *editable = &editobj->IAVIStream_iface; + + return S_OK; +} Modified: trunk/reactos/dll/win32/avifil32/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/factory… ============================================================================== --- trunk/reactos/dll/win32/avifil32/factory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/factory.c [iso-8859-1] Thu Aug 18 09:55:39 2016 @@ -25,27 +25,11 @@ static BOOL AVIFILE_bLocked; static UINT AVIFILE_uUseCount; -static HRESULT WINAPI IClassFactory_fnQueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj); -static ULONG WINAPI IClassFactory_fnAddRef(LPCLASSFACTORY iface); -static ULONG WINAPI IClassFactory_fnRelease(LPCLASSFACTORY iface); -static HRESULT WINAPI IClassFactory_fnCreateInstance(LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj); -static HRESULT WINAPI IClassFactory_fnLockServer(LPCLASSFACTORY iface,BOOL dolock); - -static const IClassFactoryVtbl iclassfact = { - IClassFactory_fnQueryInterface, - IClassFactory_fnAddRef, - IClassFactory_fnRelease, - IClassFactory_fnCreateInstance, - IClassFactory_fnLockServer -}; - typedef struct { - /* IUnknown fields */ IClassFactory IClassFactory_iface; - DWORD dwRef; - - CLSID clsid; + LONG ref; + CLSID clsid; } IClassFactoryImpl; static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) @@ -53,35 +37,10 @@ return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); } -static HRESULT AVIFILE_CreateClassFactory(const CLSID *pclsid, const IID *riid, - LPVOID *ppv) -{ - IClassFactoryImpl *pClassFactory = NULL; - HRESULT hr; - - *ppv = NULL; - - pClassFactory = HeapAlloc(GetProcessHeap(), 0, sizeof(*pClassFactory)); - if (pClassFactory == NULL) - return E_OUTOFMEMORY; - - pClassFactory->IClassFactory_iface.lpVtbl = &iclassfact; - pClassFactory->dwRef = 0; - pClassFactory->clsid = *pclsid; - - hr = IClassFactory_QueryInterface(&pClassFactory->IClassFactory_iface, riid, ppv); - if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, pClassFactory); - *ppv = NULL; - } - - return hr; -} - -static HRESULT WINAPI IClassFactory_fnQueryInterface(LPCLASSFACTORY iface, - REFIID riid,LPVOID *ppobj) -{ - TRACE("(%p,%p,%p)\n", iface, riid, ppobj); +static HRESULT WINAPI IClassFactory_fnQueryInterface(IClassFactory *iface, REFIID riid, + void **ppobj) +{ + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppobj); if ((IsEqualGUID(&IID_IUnknown, riid)) || (IsEqualGUID(&IID_IClassFactory, riid))) { @@ -93,31 +52,30 @@ return E_NOINTERFACE; } -static ULONG WINAPI IClassFactory_fnAddRef(LPCLASSFACTORY iface) -{ - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - - TRACE("(%p)\n", iface); - - return ++(This->dwRef); -} - -static ULONG WINAPI IClassFactory_fnRelease(LPCLASSFACTORY iface) -{ - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - - TRACE("(%p)\n", iface); - if ((--(This->dwRef)) > 0) - return This->dwRef; - - HeapFree(GetProcessHeap(), 0, This); - - return 0; -} - -static HRESULT WINAPI IClassFactory_fnCreateInstance(LPCLASSFACTORY iface, - LPUNKNOWN pOuter, - REFIID riid,LPVOID *ppobj) +static ULONG WINAPI IClassFactory_fnAddRef(IClassFactory *iface) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref = %u\n", This, ref); + return ref; +} + +static ULONG WINAPI IClassFactory_fnRelease(IClassFactory *iface) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref = %u\n", This, ref); + + if(!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI IClassFactory_fnCreateInstance(IClassFactory *iface, IUnknown *pOuter, + REFIID riid, void **ppobj) { IClassFactoryImpl *This = impl_from_IClassFactory(iface); @@ -147,13 +105,42 @@ return E_NOINTERFACE; } -static HRESULT WINAPI IClassFactory_fnLockServer(LPCLASSFACTORY iface,BOOL dolock) +static HRESULT WINAPI IClassFactory_fnLockServer(IClassFactory *iface, BOOL dolock) { TRACE("(%p,%d)\n",iface,dolock); AVIFILE_bLocked = dolock; return S_OK; +} + +static const IClassFactoryVtbl iclassfact = { + IClassFactory_fnQueryInterface, + IClassFactory_fnAddRef, + IClassFactory_fnRelease, + IClassFactory_fnCreateInstance, + IClassFactory_fnLockServer +}; + +static HRESULT AVIFILE_CreateClassFactory(const CLSID *clsid, const IID *riid, void **ppv) +{ + IClassFactoryImpl *cf; + HRESULT hr; + + *ppv = NULL; + + cf = HeapAlloc(GetProcessHeap(), 0, sizeof(*cf)); + if (!cf) + return E_OUTOFMEMORY; + + cf->IClassFactory_iface.lpVtbl = &iclassfact; + cf->ref = 1; + cf->clsid = *clsid; + + hr = IClassFactory_QueryInterface(&cf->IClassFactory_iface, riid, ppv); + IClassFactory_Release(&cf->IClassFactory_iface); + + return hr; } LPCWSTR AVIFILE_BasenameW(LPCWSTR szPath) Modified: trunk/reactos/dll/win32/avifil32/tmpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/tmpfile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/tmpfile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/tmpfile.c [iso-8859-1] Thu Aug 18 09:55:39 2016 @@ -260,5 +260,5 @@ } } - return (PAVIFILE)tmpFile; -} + return &tmpFile->IAVIFile_iface; +} Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Aug 18 09:55:39 2016 @@ -48,7 +48,7 @@ reactos/dll/win32/atl # Synced to WineStaging-1.9.16 reactos/dll/win32/atl80 # Synced to WineStaging-1.9.11 reactos/dll/win32/atl100 # Synced to WineStaging-1.9.11 -reactos/dll/win32/avifil32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/avifil32 # Synced to WineStaging-1.9.16 reactos/dll/win32/bcrypt # Synced to WineStaging-1.9.4 reactos/dll/win32/browseui # Out of sync reactos/dll/win32/cabinet # Synced to WineStaging-1.9.11

1 0

[akhaldi] 72271: [ATL] Sync with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: akhaldi Date: Thu Aug 18 09:54:01 2016 New Revision: 72271 URL: http://svn.reactos.org/svn/reactos?rev=72271&view=rev Log: [ATL] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/dll/win32/atl/atl_ax.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/atl/atl_ax.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl_ax.c?rev… ============================================================================== --- trunk/reactos/dll/win32/atl/atl_ax.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/atl_ax.c [iso-8859-1] Thu Aug 18 09:54:01 2016 @@ -811,7 +811,7 @@ { SIZEL inPix, inHi; - This->size.left = rect->left; This->size.right = rect->right; This->size.top = rect->top; This->size.bottom = rect->bottom; + This->size = *rect; if ( !This->control ) return; @@ -874,9 +874,7 @@ case WM_SIZE: { RECT r; - r.left = r.top = 0; - r.right = LOWORD( lParam ); - r.bottom = HIWORD( lParam ); + SetRect(&r, 0, 0, LOWORD(lParam), HIWORD(lParam)); IOCS_OnSize( This, &r ); } break; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Aug 18 09:54:01 2016 @@ -45,7 +45,7 @@ reactos/dll/win32/activeds # Synced to WineStaging-1.9.11 reactos/dll/win32/actxprxy # Synced to WineStaging-1.9.11 reactos/dll/win32/advpack # Synced to WineStaging-1.9.11 -reactos/dll/win32/atl # Synced to WineStaging-1.9.11 +reactos/dll/win32/atl # Synced to WineStaging-1.9.16 reactos/dll/win32/atl80 # Synced to WineStaging-1.9.11 reactos/dll/win32/atl100 # Synced to WineStaging-1.9.11 reactos/dll/win32/avifil32 # Synced to WineStaging-1.9.11

1 0

[akhaldi] 72270: [QUARTZ_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: akhaldi Date: Thu Aug 18 09:51:01 2016 New Revision: 72270 URL: http://svn.reactos.org/svn/reactos?rev=72270&view=rev Log: [QUARTZ_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/rostests/winetests/quartz/filtermapper.c Modified: trunk/rostests/winetests/quartz/filtermapper.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/filterma… ============================================================================== --- trunk/rostests/winetests/quartz/filtermapper.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/filtermapper.c [iso-8859-1] Thu Aug 18 09:51:01 2016 @@ -528,8 +528,7 @@ ok(pRegFilter->dwMerit == 0x5fffff,"Incorrect merit returned\n"); out: - if (pRegFilter) - CoTaskMemFree(pRegFilter); + CoTaskMemFree(pRegFilter); if (psa) { SafeArrayUnaccessData(psa);

1 0

[akhaldi] 72269: [QUARTZ] Sync with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 18 Aug '16

18 Aug '16

Author: akhaldi Date: Thu Aug 18 09:50:09 2016 New Revision: 72269 URL: http://svn.reactos.org/svn/reactos?rev=72269&view=rev Log: [QUARTZ] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/dll/directx/wine/quartz/avidec.c trunk/reactos/dll/directx/wine/quartz/dsoundrender.c trunk/reactos/dll/directx/wine/quartz/filtermapper.c trunk/reactos/dll/directx/wine/quartz/mpegsplit.c trunk/reactos/dll/directx/wine/quartz/videorenderer.c trunk/reactos/dll/directx/wine/quartz/vmr9.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/quartz/avidec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/av… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/avidec.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/avidec.c [iso-8859-1] Thu Aug 18 09:50:09 2016 @@ -152,7 +152,7 @@ if (res != ICERR_OK) ERR("Error occurred during the decompression (%x)\n", res); - /* Drop sample if its intended to be dropped */ + /* Drop sample if it's intended to be dropped */ if (flags & ICDECOMPRESS_HURRYUP) { hr = S_OK; goto error; @@ -329,11 +329,8 @@ { if (This->hvid) ICClose(This->hvid); - if (This->pBihIn) - CoTaskMemFree(This->pBihIn); - if (This->pBihOut) - CoTaskMemFree(This->pBihOut); - + CoTaskMemFree(This->pBihIn); + CoTaskMemFree(This->pBihOut); This->hvid = NULL; This->pBihIn = NULL; This->pBihOut = NULL; Modified: trunk/reactos/dll/directx/wine/quartz/dsoundrender.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/ds… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/dsoundrender.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/dsoundrender.c [iso-8859-1] Thu Aug 18 09:50:09 2016 @@ -1027,7 +1027,7 @@ } else { - ERR("pInputPin Disconncted\n"); + ERR("pInputPin Disconnected\n"); hr = E_FAIL; } LeaveCriticalSection(&This->renderer.filter.csFilter); Modified: trunk/reactos/dll/directx/wine/quartz/filtermapper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/filtermapper.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/filtermapper.c [iso-8859-1] Thu Aug 18 09:50:09 2016 @@ -591,8 +591,7 @@ for (i = 0; i < prf2->u.s2.cPins2; i++) { UINT j; - if (prf2->u.s2.rgPins2[i].clsPinCategory) - CoTaskMemFree((LPVOID)prf2->u.s2.rgPins2[i].clsPinCategory); + CoTaskMemFree((void*)prf2->u.s2.rgPins2[i].clsPinCategory); for (j = 0; j < prf2->u.s2.rgPins2[i].nMediaTypes; j++) { Modified: trunk/reactos/dll/directx/wine/quartz/mpegsplit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/mp… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/mpegsplit.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/mpegsplit.c [iso-8859-1] Thu Aug 18 09:50:09 2016 @@ -575,8 +575,7 @@ if (FAILED(hr)) { - if (amt.pbFormat) - CoTaskMemFree(amt.pbFormat); + CoTaskMemFree(amt.pbFormat); ERR("Could not create pin for MPEG audio stream (%x)\n", hr); break; } Modified: trunk/reactos/dll/directx/wine/quartz/videorenderer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/vi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/videorenderer.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/videorenderer.c [iso-8859-1] Thu Aug 18 09:50:09 2016 @@ -42,6 +42,7 @@ RECT WindowPos; LONG VideoWidth; LONG VideoHeight; + LONG FullScreenMode; } VideoRendererImpl; static inline VideoRendererImpl *impl_from_BaseWindow(BaseWindow *iface) @@ -870,7 +871,12 @@ { VideoRendererImpl *This = impl_from_IVideoWindow(iface); - FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, FullScreenMode); + TRACE("(%p/%p)->(%p): %d\n", This, iface, FullScreenMode, This->FullScreenMode); + + if (!FullScreenMode) + return E_POINTER; + + *FullScreenMode = This->FullScreenMode; return S_OK; } @@ -898,6 +904,7 @@ SetWindowPos(This->baseControlWindow.baseWindow.hWnd,0,This->DestRect.left,This->DestRect.top,This->DestRect.right,This->DestRect.bottom,SWP_NOZORDER|SWP_SHOWWINDOW); This->WindowPos = This->DestRect; } + This->FullScreenMode = FullScreenMode; return S_OK; } @@ -1005,6 +1012,7 @@ ZeroMemory(&pVideoRenderer->SourceRect, sizeof(RECT)); ZeroMemory(&pVideoRenderer->DestRect, sizeof(RECT)); ZeroMemory(&pVideoRenderer->WindowPos, sizeof(RECT)); + pVideoRenderer->FullScreenMode = OAFALSE; if (pUnkOuter) pVideoRenderer->outer_unk = pUnkOuter; Modified: trunk/reactos/dll/directx/wine/quartz/vmr9.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/vm… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/vmr9.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/vmr9.c [iso-8859-1] Thu Aug 18 09:50:09 2016 @@ -237,7 +237,17 @@ return hr; } - if (lock.Pitch != width * bmiHeader->biBitCount / 8) + if (height > 0) { + /* Bottom up image needs inverting */ + lock.pBits = (char *)lock.pBits + (height * lock.Pitch); + while (height--) + { + memcpy(lock.pBits, data, width * bmiHeader->biBitCount / 8); + data = data + width * bmiHeader->biBitCount / 8; + lock.pBits = (char *)lock.pBits - lock.Pitch; + } + } + else if (lock.Pitch != width * bmiHeader->biBitCount / 8) { WARN("Slow path! %u/%u\n", lock.Pitch, width * bmiHeader->biBitCount/8); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Aug 18 09:50:09 2016 @@ -39,7 +39,7 @@ reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/qedit # Synced to WineStaging-1.9.16 -reactos/dll/directx/wine/quartz # Synced to WineStaging-1.9.11 +reactos/dll/directx/wine/quartz # Synced to WineStaging-1.9.16 reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.9.4 reactos/dll/win32/activeds # Synced to WineStaging-1.9.11

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
47
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 August 2016