Ros-diffs March 2015

ros-diffs@reactos.org

18 participants
496 discussions

[hbelusca] 66793: [NTOS] - Let us know if we need to handle FPU emulation. - The PspDeleteLdt and PspDeleteVdmObjects do not need to return anything, they just clean possible existing structures on...
by hbelusca＠svn.reactos.org 18 Mar '15

18 Mar '15

Author: hbelusca Date: Wed Mar 18 20:43:22 2015 New Revision: 66793 URL: http://svn.reactos.org/svn/reactos?rev=66793&view=rev Log: [NTOS] - Let us know if we need to handle FPU emulation. - The PspDeleteLdt and PspDeleteVdmObjects do not need to return anything, they just clean possible existing structures only. - Use ExFreePoolWithTag when freeing Process->VdmObjects (help in detecting possible memory corruption). - Since we sometimes toy with Process->VdmObjects, give a basic implementation of PspDeleteVdmObjects that just frees VdmObjects for now. Also, add an assert in PspDeleteLdt because the LdtInformation process member should remain NULL for now (since we don't use it). Modified: trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/ke/i386/exp.c trunk/reactos/ntoskrnl/ke/i386/v86vdm.c trunk/reactos/ntoskrnl/ps/i386/psldt.c Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h [iso-8859-1] Wed Mar 18 20:43:22 2015 @@ -313,13 +313,13 @@ // // VDM and LDT Support // -NTSTATUS +VOID NTAPI PspDeleteLdt( IN PEPROCESS Process ); -NTSTATUS +VOID NTAPI PspDeleteVdmObjects( IN PEPROCESS Process Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] Wed Mar 18 20:43:22 2015 @@ -549,6 +549,7 @@ { /* FIXME: Handle FPU Emulation */ //ASSERT(FALSE); + UNIMPLEMENTED; } } Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86vdm.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] Wed Mar 18 20:43:22 2015 @@ -691,7 +691,7 @@ Context->ContextFlags = CONTEXT_FULL; /* Free VDM objects */ - ExFreePool(PsGetCurrentProcess()->VdmObjects); + ExFreePoolWithTag(PsGetCurrentProcess()->VdmObjects, ' eK'); PsGetCurrentProcess()->VdmObjects = NULL; /* Return status */ Modified: trunk/reactos/ntoskrnl/ps/i386/psldt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/i386/psldt.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/ps/i386/psldt.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/i386/psldt.c [iso-8859-1] Wed Mar 18 20:43:22 2015 @@ -14,20 +14,28 @@ /* FUNCTIONS *****************************************************************/ -NTSTATUS +VOID NTAPI PspDeleteLdt(PEPROCESS Process) { - /* FIXME */ - return STATUS_SUCCESS; + /* FIXME - LdtInformation must be null as long as we don't implement VDMs */ + ASSERT(Process->LdtInformation == NULL); } -NTSTATUS +VOID NTAPI PspDeleteVdmObjects(PEPROCESS Process) { - /* FIXME */ - return STATUS_SUCCESS; + /* If there are no VDM objects, just exit */ + if (PsGetCurrentProcess()->VdmObjects == NULL) + return; + + /* FIXME: Need to do more than just freeing the main VdmObjects member! */ + UNIMPLEMENTED; + + /* Free VDM objects */ + ExFreePoolWithTag(PsGetCurrentProcess()->VdmObjects, ' eK'); + PsGetCurrentProcess()->VdmObjects = NULL; } NTSTATUS

1 0

[dreimer] 66792: [EXPLORER] Modify the Start menu banner a bit for CLT.
by dreimer＠svn.reactos.org 18 Mar '15

18 Mar '15

Author: dreimer Date: Wed Mar 18 19:09:42 2015 New Revision: 66792 URL: http://svn.reactos.org/svn/reactos?rev=66792&view=rev Log: [EXPLORER] Modify the Start menu banner a bit for CLT. Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/shell/explorer/res/logov.bmp branches/ReactOS-0.3.17-CLT2015/reactos/base/shell/explorer/res/logov.psd Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/shell/explorer/res/logov.bmp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== Binary files - no diff available. Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/shell/explorer/res/logov.psd URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== Binary files - no diff available.

1 0

[akhaldi] 66791: [CABINET_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 18 Mar '15

18 Mar '15

Author: akhaldi Date: Wed Mar 18 16:02:57 2015 New Revision: 66791 URL: http://svn.reactos.org/svn/reactos?rev=66791&view=rev Log: [CABINET_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/cabinet/fdi.c Modified: trunk/rostests/winetests/cabinet/fdi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cabinet/fdi.c?r… ============================================================================== --- trunk/rostests/winetests/cabinet/fdi.c [iso-8859-1] (original) +++ trunk/rostests/winetests/cabinet/fdi.c [iso-8859-1] Wed Mar 18 16:02:57 2015 @@ -187,6 +187,39 @@ return SetFilePointer(handle, dist, NULL, seektype); } +/* Callbacks for testing FDIIsCabinet with hf == 0 */ +static INT_PTR static_fdi_handle; + +static INT_PTR CDECL fdi_open_static(char *pszFile, int oflag, int pmode) +{ + ok(0, "FDIIsCabinet shouldn't call pfnopen\n"); + return 1; +} + +static UINT CDECL fdi_read_static(INT_PTR hf, void *pv, UINT cb) +{ + ok(hf == 0, "unexpected hf %lx\n", hf); + return fdi_read(static_fdi_handle, pv, cb); +} + +static UINT CDECL fdi_write_static(INT_PTR hf, void *pv, UINT cb) +{ + ok(0, "FDIIsCabinet shouldn't call pfnwrite\n"); + return 0; +} + +static int CDECL fdi_close_static(INT_PTR hf) +{ + ok(0, "FDIIsCabinet shouldn't call pfnclose\n"); + return 0; +} + +static LONG CDECL fdi_seek_static(INT_PTR hf, LONG dist, int seektype) +{ + ok(hf == 0, "unexpected hf %lx\n", hf); + return fdi_seek(static_fdi_handle, dist, seektype); +} + static void test_FDICreate(void) { HFDI hfdi; @@ -683,6 +716,28 @@ fdi_close(fd); FDIDestroy(hfdi); + + hfdi = FDICreate(fdi_alloc, fdi_free, fdi_open_static, fdi_read_static, + fdi_write_static, fdi_close_static, fdi_seek_static, + cpuUNKNOWN, &erf); + ok(hfdi != NULL, "Expected non-NULL context\n"); + + /* FDIIsCabinet accepts hf == 0 even though it's not a valid result of pfnopen */ + static_fdi_handle = fdi_open(extract, 0, 0); + ZeroMemory(&cabinfo, sizeof(FDICABINETINFO)); + SetLastError(0xdeadbeef); + ret = FDIIsCabinet(hfdi, 0, &cabinfo); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); + ok(cabinfo.cFiles == 4, "Expected 4, got %d\n", cabinfo.cFiles); + ok(cabinfo.cFolders == 1, "Expected 1, got %d\n", cabinfo.cFolders); + ok(cabinfo.setID == 0xbeef, "Expected 0xbeef, got %d\n", cabinfo.setID); + ok(cabinfo.cbCabinet == 182, "Expected 182, got %d\n", cabinfo.cbCabinet); + ok(cabinfo.iCabinet == 0, "Expected 0, got %d\n", cabinfo.iCabinet); + + fdi_close(static_fdi_handle); + FDIDestroy(hfdi); + delete_test_files(); }

1 0

[akhaldi] 66790: [CABINET] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 18 Mar '15

18 Mar '15

Author: akhaldi Date: Wed Mar 18 16:02:37 2015 New Revision: 66790 URL: http://svn.reactos.org/svn/reactos?rev=66790&view=rev Log: [CABINET] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/cabinet/fdi.c trunk/reactos/media/doc/README.WINE 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] Wed Mar 18 16:02:37 2015 @@ -690,11 +690,6 @@ TRACE("(hfdi == ^%p, hf == ^%ld, pfdici == ^%p)\n", hfdi, hf, pfdici); if (!fdi) return FALSE; - - if (!hf) { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } if (!pfdici) { SetLastError(ERROR_BAD_ARGUMENTS); 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] Wed Mar 18 16:02:37 2015 @@ -58,7 +58,7 @@ reactos/dll/win32/avifil32 # Synced to WineStaging-1.7.37 reactos/dll/win32/bcrypt # Synced to WineStaging-1.7.37 reactos/dll/win32/browseui # Out of sync -reactos/dll/win32/cabinet # Synced to Wine-1.7.27 +reactos/dll/win32/cabinet # Synced to WineStaging-1.7.37 reactos/dll/win32/clusapi # Synced to Wine-1.7.27 reactos/dll/win32/comcat # Synced to Wine-1.7.27 reactos/dll/win32/comctl32 # Synced to Wine-1.7.27

1 0

[akhaldi] 66789: [BCRYPT] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 18 Mar '15

18 Mar '15

Author: akhaldi Date: Wed Mar 18 15:53:18 2015 New Revision: 66789 URL: http://svn.reactos.org/svn/reactos?rev=66789&view=rev Log: [BCRYPT] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/bcrypt/bcrypt.spec trunk/reactos/dll/win32/bcrypt/bcrypt_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/bcrypt/bcrypt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/bcrypt/bcrypt.sp… ============================================================================== --- trunk/reactos/dll/win32/bcrypt/bcrypt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/bcrypt/bcrypt.spec [iso-8859-1] Wed Mar 18 15:53:18 2015 @@ -28,7 +28,7 @@ @ stub BCryptGenerateKeyPair @ stub BCryptGenerateSymmetricKey @ stdcall BCryptGetFipsAlgorithmMode(ptr) -@ stub BCryptGetProperty +@ stdcall BCryptGetProperty(ptr wstr ptr long ptr long) @ stub BCryptHashData @ stub BCryptImportKey @ stub BCryptImportKeyPair Modified: trunk/reactos/dll/win32/bcrypt/bcrypt_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/bcrypt/bcrypt_ma… ============================================================================== --- trunk/reactos/dll/win32/bcrypt/bcrypt_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/bcrypt/bcrypt_main.c [iso-8859-1] Wed Mar 18 15:53:18 2015 @@ -107,3 +107,10 @@ *enabled = FALSE; return STATUS_SUCCESS; } + +NTSTATUS WINAPI BCryptGetProperty(BCRYPT_HANDLE obj, LPCWSTR prop, UCHAR *buffer, ULONG count, ULONG *res, ULONG flags) +{ + FIXME("%p, %s, %p, %u, %p, %08x - stub\n", obj, wine_dbgstr_w(prop), buffer, count, res, flags); + + return STATUS_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] Wed Mar 18 15:53:18 2015 @@ -56,7 +56,7 @@ reactos/dll/win32/atl80 # Synced to WineStaging-1.7.37 reactos/dll/win32/atl100 # Synced to WineStaging-1.7.37 reactos/dll/win32/avifil32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/bcrypt # Synced to Wine-1.7.27 +reactos/dll/win32/bcrypt # Synced to WineStaging-1.7.37 reactos/dll/win32/browseui # Out of sync reactos/dll/win32/cabinet # Synced to Wine-1.7.27 reactos/dll/win32/clusapi # Synced to Wine-1.7.27

1 0

[akhaldi] 66788: [PSDK] Add missing BCRYPT_HANDLE.
by akhaldi＠svn.reactos.org 18 Mar '15

18 Mar '15

Author: akhaldi Date: Wed Mar 18 15:42:53 2015 New Revision: 66788 URL: http://svn.reactos.org/svn/reactos?rev=66788&view=rev Log: [PSDK] Add missing BCRYPT_HANDLE. Modified: trunk/reactos/include/psdk/bcrypt.h Modified: trunk/reactos/include/psdk/bcrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/bcrypt.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/bcrypt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/bcrypt.h [iso-8859-1] Wed Mar 18 15:42:53 2015 @@ -48,6 +48,7 @@ } BCRYPT_ALGORITHM_IDENTIFIER; typedef PVOID BCRYPT_ALG_HANDLE; +typedef PVOID BCRYPT_HANDLE; #define BCRYPT_RNG_USE_ENTROPY_IN_BUFFER 0x00000001 #define BCRYPT_USE_SYSTEM_PREFERRED_RNG 0x00000002

1 0

[akhaldi] 66787: [AVIFIL32] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 18 Mar '15

18 Mar '15

Author: akhaldi Date: Wed Mar 18 15:39:32 2015 New Revision: 66787 URL: http://svn.reactos.org/svn/reactos?rev=66787&view=rev Log: [AVIFIL32] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/avifil32/avifile.c trunk/reactos/dll/win32/avifil32/editstream.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/avifil32/avifile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile.c [iso-8859-1] Wed Mar 18 15:39:32 2015 @@ -446,13 +446,12 @@ This->ppStreams[nStream] != NULL) { /* ... so delete it now */ HeapFree(GetProcessHeap(), 0, This->ppStreams[nStream]); - - if (This->fInfo.dwStreams - nStream > 0) - memcpy(This->ppStreams + nStream, This->ppStreams + nStream + 1, - (This->fInfo.dwStreams - nStream) * sizeof(IAVIStreamImpl*)); + This->fInfo.dwStreams--; + if (nStream < This->fInfo.dwStreams) + memmove(&This->ppStreams[nStream], &This->ppStreams[nStream + 1], + (This->fInfo.dwStreams - nStream) * sizeof(This->ppStreams[0])); This->ppStreams[This->fInfo.dwStreams] = NULL; - This->fInfo.dwStreams--; This->fDirty = TRUE; /* This->fInfo will be updated further when asked for */ @@ -1406,11 +1405,21 @@ /* pre-conditions */ assert(This != NULL && This->ppStreams[0] != NULL); - if (This->idxRecords == NULL || This->cbIdxRecords == 0) { - This->cbIdxRecords += 1024 * sizeof(AVIINDEXENTRY); - This->idxRecords = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->cbIdxRecords); - if (This->idxRecords == NULL) + if (This->idxRecords == NULL || This->cbIdxRecords / sizeof(AVIINDEXENTRY) <= This->nIdxRecords) { + DWORD new_count = This->cbIdxRecords + 1024 * sizeof(AVIINDEXENTRY); + void *mem; + if (!This->idxRecords) + mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, new_count); + else + mem = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->idxRecords, new_count); + if (mem) { + This->cbIdxRecords = new_count; + This->idxRecords = mem; + } else { + HeapFree(GetProcessHeap(), 0, This->idxRecords); + This->idxRecords = NULL; return AVIERR_MEMORY; + } } assert(This->nIdxRecords < This->cbIdxRecords/sizeof(AVIINDEXENTRY)); @@ -1442,7 +1451,7 @@ dwPos += ((pStream->cbFormat + 1) & ~1U); if (pStream->lpHandlerData != NULL && pStream->cbHandlerData > 0) dwPos += 2 * sizeof(DWORD) + ((pStream->cbHandlerData + 1) & ~1U); - if (lstrlenW(pStream->sInfo.szName) > 0) + if (pStream->sInfo.szName[0]) dwPos += 2 * sizeof(DWORD) + ((lstrlenW(pStream->sInfo.szName) + 1) & ~1U); } @@ -2201,7 +2210,7 @@ } /* ... an optional name for this stream ... */ - if (lstrlenW(pStream->sInfo.szName) > 0) { + if (pStream->sInfo.szName[0]) { LPSTR str; ck.ckid = ckidSTREAMNAME; 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] Wed Mar 18 15:39:32 2015 @@ -152,10 +152,9 @@ /* remove part nr */ IAVIStream_Release(This->pStreams[nr].pStream); This->nStreams--; - if (This->nStreams - nr > 0) { - memmove(This->pStreams + nr, This->pStreams + nr + 1, - (This->nStreams - nr) * sizeof(EditStreamTable)); - } + if (nr < This->nStreams) + memmove(&This->pStreams[nr], &This->pStreams[nr + 1], + (This->nStreams - nr) * sizeof(This->pStreams[0])); This->pStreams[This->nStreams].pStream = NULL; This->pStreams[This->nStreams].dwStart = 0; This->pStreams[This->nStreams].dwLength = 0; 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] Wed Mar 18 15:39:32 2015 @@ -55,7 +55,7 @@ reactos/dll/win32/atl # Synced to WineStaging-1.7.37 reactos/dll/win32/atl80 # Synced to WineStaging-1.7.37 reactos/dll/win32/atl100 # Synced to WineStaging-1.7.37 -reactos/dll/win32/avifil32 # Synced to Wine-1.7.27 +reactos/dll/win32/avifil32 # Synced to WineStaging-1.7.37 reactos/dll/win32/bcrypt # Synced to Wine-1.7.27 reactos/dll/win32/browseui # Out of sync reactos/dll/win32/cabinet # Synced to Wine-1.7.27

1 0

[akhaldi] 66786: [ATL100_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 18 Mar '15

18 Mar '15

Author: akhaldi Date: Wed Mar 18 15:32:41 2015 New Revision: 66786 URL: http://svn.reactos.org/svn/reactos?rev=66786&view=rev Log: [ATL100_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/atl100/CMakeLists.txt trunk/rostests/winetests/atl100/atl.c Modified: trunk/rostests/winetests/atl100/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl100/CMakeLis… ============================================================================== --- trunk/rostests/winetests/atl100/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/atl100/CMakeLists.txt [iso-8859-1] Wed Mar 18 15:32:41 2015 @@ -1,4 +1,5 @@ +add_definitions(-DUSE_WINE_TODOS) add_definitions(-D_ATL_VER=_ATL_VER_100) list(APPEND SOURCE atl.c testlist.c) add_executable(atl100_winetest ${SOURCE}) Modified: trunk/rostests/winetests/atl100/atl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl100/atl.c?re… ============================================================================== --- trunk/rostests/winetests/atl100/atl.c [iso-8859-1] (original) +++ trunk/rostests/winetests/atl100/atl.c [iso-8859-1] Wed Mar 18 15:32:41 2015 @@ -33,6 +33,7 @@ #include <wingdi.h> #include <objbase.h> #include <oleauto.h> +#include <exdisp.h> #include <wine/atlbase.h> #include <mshtml.h> @@ -50,6 +51,25 @@ static const GUID CATID_CatTest2 = {0x178fc163,0x0000,0x0000,{0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x46}}; #define CATID_CATTEST2_STR "178fc163-0000-0000-0000-000000000246" + +static const WCHAR emptyW[] = {'\0'}; +static const WCHAR randomW[] = {'r','a','n','d','o','m','\0'}; +static const WCHAR progid1W[] = {'S','h','e','l','l','.','E','x','p','l','o','r','e','r','.','2','\0'}; +static const WCHAR clsid1W[] = {'{','8','8','5','6','f','9','6','1','-','3','4','0','a','-', + '1','1','d','0','-','a','9','6','b','-', + '0','0','c','0','4','f','d','7','0','5','a','2','}','\0'}; +static const WCHAR url1W[] = {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q', + '.','o','r','g','/','t','e','s','t','s','/','w','i','n','e','h','q','_', + 's','n','a','p','s','h','o','t','/','\0'}; +static const WCHAR mshtml1W[] = {'m','s','h','t','m','l',':','<','h','t','m','l','>','<','b','o','d','y','>', + 't','e','s','t','<','/','b','o','d','y','>','<','/','h','t','m','l','>','\0'}; +static const WCHAR mshtml2W[] = {'M','S','H','T','M','L',':','<','h','t','m','l','>','<','b','o','d','y','>', + 't','e','s','t','<','/','b','o','d','y','>','<','/','h','t','m','l','>','\0'}; +static const WCHAR mshtml3W[] = {'<','h','t','m','l','>','<','b','o','d','y','>', 't','e','s','t', + '<','/','b','o','d','y','>','<','/','h','t','m','l','>','\0'}; +static const WCHAR fileW[] = {'f','i','l','e',':','/','/','/','\0'}; +static const WCHAR html_fileW[] = {'t','e','s','t','.','h','t','m','l','\0'}; +static const char html_str[] = "<html><body>test</body><html>"; static BOOL is_process_limited(void) { @@ -599,32 +619,405 @@ static void test_ax_win(void) { - BOOL ret; + DWORD ret, ret_size, i; + HRESULT res; + HWND hwnd; + HANDLE hfile; + IUnknown *control; + WNDPROC wndproc[2] = {NULL, NULL}; + WCHAR file_uri1W[MAX_PATH], pathW[MAX_PATH]; WNDCLASSEXW wcex; - static const WCHAR AtlAxWin100[] = {'A','t','l','A','x','W','i','n','1','0','0',0}; - static const WCHAR AtlAxWinLic100[] = {'A','t','l','A','x','W','i','n','L','i','c','1','0','0',0}; static HMODULE hinstance = 0; + static const WCHAR cls_names[][16] = + { + {'A','t','l','A','x','W','i','n','1','0','0',0}, + {'A','t','l','A','x','W','i','n','L','i','c','1','0','0',0} + }; ret = AtlAxWinInit(); ok(ret, "AtlAxWinInit failed\n"); hinstance = GetModuleHandleA(NULL); - memset(&wcex, 0, sizeof(wcex)); - wcex.cbSize = sizeof(wcex); - ret = GetClassInfoExW(hinstance, AtlAxWin100, &wcex); - ok(ret, "AtlAxWin100 has not registered\n"); - ok(wcex.style == (CS_GLOBALCLASS | CS_DBLCLKS), "wcex.style %08x\n", wcex.style); - - memset(&wcex, 0, sizeof(wcex)); - wcex.cbSize = sizeof(wcex); - ret = GetClassInfoExW(hinstance, AtlAxWinLic100, &wcex); - ok(ret, "AtlAxWinLic100 has not registered\n"); - ok(wcex.style == (CS_GLOBALCLASS | CS_DBLCLKS), "wcex.style %08x\n", wcex.style); + for (i = 0; i < 2; i++) + { + memset(&wcex, 0, sizeof(wcex)); + wcex.cbSize = sizeof(wcex); + ret = GetClassInfoExW(hinstance, cls_names[i], &wcex); + ok(ret, "%s has not registered\n", wine_dbgstr_w(cls_names[i])); + ok(wcex.style == (CS_GLOBALCLASS | CS_DBLCLKS), "wcex.style %08x\n", wcex.style); + wndproc[i] = wcex.lpfnWndProc; + + hwnd = CreateWindowW(cls_names[i], NULL, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed!\n"); + control = (IUnknown *)0xdeadbeef; + res = AtlAxGetControl(hwnd, &control); + ok(res == E_FAIL, "Expected E_FAIL, returned %08x\n", res); + ok(!control, "returned %p\n", control); + if (control) IUnknown_Release(control); + DestroyWindow(hwnd); + + hwnd = CreateWindowW(cls_names[i], emptyW, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed!\n"); + control = (IUnknown *)0xdeadbeef; + res = AtlAxGetControl(hwnd, &control); + ok(res == E_FAIL, "Expected E_FAIL, returned %08x\n", res); + ok(!control, "returned %p\n", control); + if (control) IUnknown_Release(control); + DestroyWindow(hwnd); + + hwnd = CreateWindowW(cls_names[i], randomW, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + todo_wine ok(!hwnd, "returned %p\n", hwnd); + if(hwnd) DestroyWindow(hwnd); + + hwnd = CreateWindowW(cls_names[i], progid1W, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed!\n"); + control = NULL; + res = AtlAxGetControl(hwnd, &control); + ok(res == S_OK, "AtlAxGetControl failed with res %08x\n", res); + ok(control != NULL, "AtlAxGetControl failed!\n"); + IUnknown_Release(control); + DestroyWindow(hwnd); + + hwnd = CreateWindowW(cls_names[i], clsid1W, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed!\n"); + control = NULL; + res = AtlAxGetControl(hwnd, &control); + ok(res == S_OK, "AtlAxGetControl failed with res %08x\n", res); + ok(control != NULL, "AtlAxGetControl failed!\n"); + IUnknown_Release(control); + DestroyWindow(hwnd); + + hwnd = CreateWindowW(cls_names[i], url1W, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed!\n"); + control = NULL; + res = AtlAxGetControl(hwnd, &control); + ok(res == S_OK, "AtlAxGetControl failed with res %08x\n", res); + ok(control != NULL, "AtlAxGetControl failed!\n"); + IUnknown_Release(control); + DestroyWindow(hwnd); + + /* test html stream with "MSHTML:" prefix */ + hwnd = CreateWindowW(cls_names[i], mshtml1W, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed!\n"); + control = NULL; + res = AtlAxGetControl(hwnd, &control); + ok(res == S_OK, "AtlAxGetControl failed with res %08x\n", res); + ok(control != NULL, "AtlAxGetControl failed!\n"); + IUnknown_Release(control); + DestroyWindow(hwnd); + + hwnd = CreateWindowW(cls_names[i], mshtml2W, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed!\n"); + control = NULL; + res = AtlAxGetControl(hwnd, &control); + ok(res == S_OK, "AtlAxGetControl failed with res %08x\n", res); + ok(control != NULL, "AtlAxGetControl failed!\n"); + IUnknown_Release(control); + DestroyWindow(hwnd); + + /* test html stream without "MSHTML:" prefix */ + hwnd = CreateWindowW(cls_names[i], mshtml3W, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + todo_wine ok(!hwnd, "returned %p\n", hwnd); + if(hwnd) DestroyWindow(hwnd); + + ret = GetTempPathW(MAX_PATH, pathW); + ok(ret, "GetTempPath failed!\n"); + lstrcatW(pathW, html_fileW); + hfile = CreateFileW(pathW, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "failed to create file\n"); + ret = WriteFile(hfile, html_str, sizeof(html_str), &ret_size, NULL); + ok(ret, "WriteFile failed\n"); + CloseHandle(hfile); + + /* test C:// scheme */ + hwnd = CreateWindowW(cls_names[i], pathW, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed!\n"); + control = NULL; + res = AtlAxGetControl(hwnd, &control); + ok(res == S_OK, "AtlAxGetControl failed with res %08x\n", res); + ok(control != NULL, "AtlAxGetControl failed!\n"); + IUnknown_Release(control); + DestroyWindow(hwnd); + + /* test file:// scheme */ + lstrcpyW(file_uri1W, fileW); + lstrcatW(file_uri1W, pathW); + hwnd = CreateWindowW(cls_names[i], file_uri1W, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed!\n"); + control = NULL; + res = AtlAxGetControl(hwnd, &control); + ok(res == S_OK, "AtlAxGetControl failed with res %08x\n", res); + ok(control != NULL, "AtlAxGetControl failed!\n"); + IUnknown_Release(control); + DestroyWindow(hwnd); + + /* test file:// scheme on non-existent file */ + ret = DeleteFileW(pathW); + ok(ret, "DeleteFile failed!\n"); + hwnd = CreateWindowW(cls_names[i], file_uri1W, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed!\n"); + control = NULL; + res = AtlAxGetControl(hwnd, &control); + ok(res == S_OK, "AtlAxGetControl failed with res %08x\n", res); + ok(control != NULL, "AtlAxGetControl failed!\n"); + IUnknown_Release(control); + DestroyWindow(hwnd); + } + todo_wine ok(wndproc[0] != wndproc[1], "expected different proc!\n"); +} + +static ATOM register_class(void) +{ + WNDCLASSA wndclassA; + + wndclassA.style = 0; + wndclassA.lpfnWndProc = DefWindowProcA; + wndclassA.cbClsExtra = 0; + wndclassA.cbWndExtra = 0; + wndclassA.hInstance = GetModuleHandleA(NULL); + wndclassA.hIcon = NULL; + wndclassA.hCursor = LoadCursorA(NULL, (LPSTR)IDC_ARROW); + wndclassA.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1); + wndclassA.lpszMenuName = NULL; + wndclassA.lpszClassName = "WineAtlTestClass"; + + return RegisterClassA(&wndclassA); +} + +static HWND create_container_window(void) +{ + return CreateWindowA("WineAtlTestClass", "Wine ATL Test Window", 0, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, NULL, NULL, NULL, NULL); +} + +static void test_AtlAxAttachControl(void) +{ + HWND hwnd; + HRESULT hr; + IUnknown *control, *container; + LONG val; + + hr = AtlAxAttachControl(NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr); + + container = (IUnknown *)0xdeadbeef; + hr = AtlAxAttachControl(NULL, NULL, &container); + ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr); + ok(container == (IUnknown *)0xdeadbeef, + "Expected the output container pointer to be untouched, got %p\n", container); + + hwnd = create_container_window(); + hr = AtlAxAttachControl(NULL, hwnd, NULL); + ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr); + DestroyWindow(hwnd); + + hwnd = create_container_window(); + container = (IUnknown *)0xdeadbeef; + hr = AtlAxAttachControl(NULL, hwnd, &container); + ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr); + ok(container == (IUnknown *)0xdeadbeef, "returned %p\n", container); + DestroyWindow(hwnd); + + hr = CoCreateInstance(&CLSID_WebBrowser, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IOleObject, (void **)&control); + ok(hr == S_OK, "Expected CoCreateInstance to return S_OK, got 0x%08x\n", hr); + + if (FAILED(hr)) + { + skip("Couldn't obtain a test IOleObject instance\n"); + return; + } + + hr = AtlAxAttachControl(control, NULL, NULL); + ok(hr == S_FALSE, "Expected AtlAxAttachControl to return S_FALSE, got 0x%08x\n", hr); + + container = NULL; + hr = AtlAxAttachControl(control, NULL, &container); + ok(hr == S_FALSE, "Expected AtlAxAttachControl to return S_FALSE, got 0x%08x\n", hr); + ok(container != NULL, "got %p\n", container); + IUnknown_Release(container); + + hwnd = create_container_window(); + SetWindowLongW(hwnd, GWLP_USERDATA, 0xdeadbeef); + hr = AtlAxAttachControl(control, hwnd, NULL); + ok(hr == S_OK, "Expected AtlAxAttachControl to return S_OK, got 0x%08x\n", hr); + val = GetWindowLongW(hwnd, GWLP_USERDATA); + ok(val == 0xdeadbeef, "returned %08x\n", val); + DestroyWindow(hwnd); + + hwnd = create_container_window(); + SetWindowLongW(hwnd, GWLP_USERDATA, 0xdeadbeef); + container = NULL; + hr = AtlAxAttachControl(control, hwnd, &container); + ok(hr == S_OK, "Expected AtlAxAttachControl to return S_OK, got 0x%08x\n", hr); + ok(container != NULL, "Expected not NULL!\n"); + val = GetWindowLongW(hwnd, GWLP_USERDATA); + ok(val == 0xdeadbeef, "Expected unchanged, returned %08x\n", val); + DestroyWindow(hwnd); + + IUnknown_Release(control); +} + +static void test_AtlAxCreateControl(void) +{ + HWND hwnd; + IUnknown *control, *container; + HRESULT hr; + DWORD ret, ret_size; + HANDLE hfile; + WCHAR file_uri1W[MAX_PATH], pathW[MAX_PATH]; + + container = NULL; + control = (IUnknown *)0xdeadbeef; + hr = AtlAxCreateControlEx(NULL, NULL, NULL, &container, &control, NULL, NULL); + todo_wine ok(hr == S_FALSE, "got 0x%08x\n", hr); + todo_wine ok(container != NULL, "returned %p\n", container); + ok(!control, "returned %p\n", control); + + container = NULL; + control = (IUnknown *)0xdeadbeef; + hwnd = create_container_window(); + ok(hwnd != NULL, "create window failed!\n"); + hr = AtlAxCreateControlEx(NULL, hwnd, NULL, &container, &control, &IID_NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(container != NULL, "returned %p!\n", container); + ok(!control, "returned %p\n", control); + DestroyWindow(hwnd); + + container = NULL; + control = (IUnknown *)0xdeadbeef; + hwnd = create_container_window(); + ok(hwnd != NULL, "create window failed!\n"); + hr = AtlAxCreateControlEx(emptyW, hwnd, NULL, &container, &control, &IID_NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(container != NULL, "returned %p!\n", container); + ok(!control, "returned %p\n", control); + DestroyWindow(hwnd); + + container = (IUnknown *)0xdeadbeef; + control = (IUnknown *)0xdeadbeef; + hwnd = create_container_window(); + ok(hwnd != NULL, "create window failed!\n"); + hr = AtlAxCreateControlEx(randomW, hwnd, NULL, &container, &control, &IID_NULL, NULL); + ok(hr == CO_E_CLASSSTRING, "got 0x%08x\n", hr); + ok(!container, "returned %p!\n", container); + ok(!control, "returned %p\n", control); + DestroyWindow(hwnd); + + container = NULL; + control = NULL; + hwnd = create_container_window(); + ok(hwnd != NULL, "create window failed!\n"); + hr = AtlAxCreateControlEx(progid1W, hwnd, NULL, &container, &control, &IID_NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(container != NULL, "returned %p!\n", container); + ok(control != NULL, "returned %p\n", control); + DestroyWindow(hwnd); + + container = NULL; + control = NULL; + hwnd = create_container_window(); + ok(hwnd != NULL, "create window failed!\n"); + hr = AtlAxCreateControlEx(clsid1W, hwnd, NULL, &container, &control, &IID_NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(container != NULL, "returned %p!\n", container); + ok(control != NULL, "returned %p\n", control); + DestroyWindow(hwnd); + + container = NULL; + control = NULL; + hwnd = create_container_window(); + ok(hwnd != NULL, "create window failed!\n"); + hr = AtlAxCreateControlEx(url1W, hwnd, NULL, &container, &control, &IID_NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(container != NULL, "returned %p!\n", container); + ok(control != NULL, "returned %p\n", control); + DestroyWindow(hwnd); + + container = NULL; + control = NULL; + hwnd = create_container_window(); + ok(hwnd != NULL, "create window failed!\n"); + hr = AtlAxCreateControlEx(mshtml1W, hwnd, NULL, &container, &control, &IID_NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(container != NULL, "returned %p!\n", container); + ok(control != NULL, "returned %p\n", control); + DestroyWindow(hwnd); + + container = NULL; + control = NULL; + hwnd = create_container_window(); + ok(hwnd != NULL, "create window failed!\n"); + hr = AtlAxCreateControlEx(mshtml2W, hwnd, NULL, &container, &control, &IID_NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(container != NULL, "returned %p!\n", container); + ok(control != NULL, "returned %p\n", control); + DestroyWindow(hwnd); + + container = (IUnknown *)0xdeadbeef; + control = (IUnknown *)0xdeadbeef; + hwnd = create_container_window(); + ok(hwnd != NULL, "create window failed!\n"); + hr = AtlAxCreateControlEx(mshtml3W, hwnd, NULL, &container, &control, &IID_NULL, NULL); + ok(hr == CO_E_CLASSSTRING, "got 0x%08x\n", hr); + ok(!container, "returned %p!\n", container); + ok(!control, "returned %p\n", control); + DestroyWindow(hwnd); + + ret = GetTempPathW(MAX_PATH, pathW); + ok(ret, "GetTempPath failed!\n"); + lstrcatW(pathW, html_fileW); + hfile = CreateFileW(pathW, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "failed to create file\n"); + ret = WriteFile(hfile, html_str, sizeof(html_str), &ret_size, NULL); + ok(ret, "WriteFile failed\n"); + CloseHandle(hfile); + + /* test C:// scheme */ + container = NULL; + control = NULL; + hwnd = create_container_window(); + ok(hwnd != NULL, "create window failed!\n"); + hr = AtlAxCreateControlEx(pathW, hwnd, NULL, &container, &control, &IID_NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(container != NULL, "returned %p!\n", container); + ok(control != NULL, "returned %p\n", control); + DestroyWindow(hwnd); + + /* test file:// scheme */ + lstrcpyW(file_uri1W, fileW); + lstrcatW(file_uri1W, pathW); + container = NULL; + control = NULL; + hwnd = create_container_window(); + ok(hwnd != NULL, "create window failed!\n"); + hr = AtlAxCreateControlEx(file_uri1W, hwnd, NULL, &container, &control, &IID_NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(container != NULL, "returned %p!\n", container); + ok(control != NULL, "returned %p\n", control); + DestroyWindow(hwnd); + + /* test file:// scheme on non-existent file. */ + ret = DeleteFileW(pathW); + ok(ret, "DeleteFile failed!\n"); + container = NULL; + control = NULL; + hwnd = create_container_window(); + ok(hwnd != NULL, "create window failed!\n"); + hr = AtlAxCreateControlEx(file_uri1W, hwnd, NULL, &container, &control, &IID_NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(container != NULL, "returned %p!\n", container); + ok(control != NULL, "returned %p\n", control); + DestroyWindow(hwnd); } START_TEST(atl) { + if (!register_class()) + return; + CoInitialize(NULL); test_winmodule(); @@ -633,6 +1026,8 @@ test_cp(); test_source_iface(); test_ax_win(); + test_AtlAxAttachControl(); + test_AtlAxCreateControl(); CoUninitialize(); }

1 0

[akhaldi] 66785: [ATL][ATL80][ATL100] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 18 Mar '15

18 Mar '15

Author: akhaldi Date: Wed Mar 18 15:30:17 2015 New Revision: 66785 URL: http://svn.reactos.org/svn/reactos?rev=66785&view=rev Log: [ATL][ATL80][ATL100] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/atl/atl_ax.c trunk/reactos/dll/win32/atl/registrar.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] Wed Mar 18 15:30:17 2015 @@ -22,6 +22,7 @@ #include <ole2.h> #include <exdisp.h> +#include <shlwapi.h> #include <wine/atlwin.h> typedef struct IOCS { @@ -38,6 +39,8 @@ WNDPROC OrigWndProc; BOOL fActive, fInPlace, fWindowless; } IOCS; + +static const WCHAR wine_atl_iocsW[] = {'_','_','W','I','N','E','_','A','T','L','_','I','O','C','S','\0'}; /********************************************************************** * AtlAxWin class window procedure @@ -134,7 +137,7 @@ if ( This->hWnd ) { SetWindowLongPtrW( This->hWnd, GWLP_WNDPROC, (ULONG_PTR) This->OrigWndProc ); - SetWindowLongPtrW( This->hWnd, GWLP_USERDATA, 0 ); + RemovePropW( This->hWnd, wine_atl_iocsW); This->hWnd = NULL; } if ( This->control ) @@ -890,7 +893,7 @@ static LRESULT CALLBACK AtlHost_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ) { - IOCS *This = (IOCS*) GetWindowLongPtrW( hWnd, GWLP_USERDATA ); + IOCS *This = (IOCS*) GetPropW( hWnd, wine_atl_iocsW ); return IOCS_OnWndProc( This, hWnd, wMsg, wParam, lParam ); } @@ -899,7 +902,7 @@ This->hWnd = hWnd; IUnknown_QueryInterface( pUnkControl, &IID_IOleObject, (void**)&This->control ); IOleObject_SetClientSite( This->control, &This->IOleClientSite_iface ); - SetWindowLongPtrW( hWnd, GWLP_USERDATA, (ULONG_PTR) This ); + SetPropW( hWnd, wine_atl_iocsW, This ); This->OrigWndProc = (WNDPROC)SetWindowLongPtrW( hWnd, GWLP_WNDPROC, (ULONG_PTR) AtlHost_wndproc ); return S_OK; @@ -973,6 +976,48 @@ NULL, NULL, NULL ); } +enum content +{ + IsEmpty = 0, + IsGUID = 1, + IsHTML = 2, + IsURL = 3, + IsUnknown = 4 +}; + +static enum content get_content_type(LPCOLESTR name, CLSID *control_id) +{ + WCHAR new_urlW[MAX_PATH]; + DWORD size = MAX_PATH; + WCHAR mshtml_prefixW[] = {'m','s','h','t','m','l',':','\0'}; + + if (!name || !name[0]) + { + WARN("name %s\n", wine_dbgstr_w(name)); + return IsEmpty; + } + + if (CLSIDFromString(name, control_id) == S_OK || + CLSIDFromProgID(name, control_id) == S_OK) + return IsGUID; + + if (PathIsURLW (name) || + UrlApplySchemeW(name, new_urlW, &size, URL_APPLY_GUESSSCHEME|URL_APPLY_GUESSFILE) == S_OK) + { + *control_id = CLSID_WebBrowser; + return IsURL; + } + + if (!strncmpiW(name, mshtml_prefixW, 7)) + { + FIXME("mshtml prefix not implemented\n"); + *control_id = CLSID_WebBrowser; + return IsHTML; + } + + return IsUnknown; +} + /*********************************************************************** * AtlAxCreateControlEx [atl100.@] * @@ -987,24 +1032,24 @@ CLSID controlId; HRESULT hRes; IOleObject *pControl; - IUnknown *pUnkControl; + IUnknown *pUnkControl = NULL; IPersistStreamInit *pPSInit; - IUnknown *pContainer; - enum {IsGUID=0,IsHTML=1,IsURL=2} content; + IUnknown *pContainer = NULL; + enum content content; TRACE("(%s %p %p %p %p %p %p)\n", debugstr_w(lpszName), hWnd, pStream, ppUnkContainer, ppUnkControl, iidSink, punkSink); - hRes = CLSIDFromString( lpszName, &controlId ); - if ( FAILED(hRes) ) - hRes = CLSIDFromProgID( lpszName, &controlId ); - if ( SUCCEEDED( hRes ) ) - content = IsGUID; - else { - /* FIXME - check for MSHTML: prefix! */ - content = IsURL; - controlId = CLSID_WebBrowser; - } + if (ppUnkContainer) *ppUnkContainer = NULL; + if (ppUnkControl) *ppUnkControl = NULL; + + content = get_content_type(lpszName, &controlId); + + if (content == IsEmpty) + return S_OK; + + if (content == IsUnknown) + return CO_E_CLASSSTRING; hRes = CoCreateInstance( &controlId, 0, CLSCTX_ALL, &IID_IOleObject, (void**) &pControl ); @@ -1121,7 +1166,6 @@ #define GET_DWORD(x) (*(const DWORD *)(x)) #define PUT_BLOCK(x,y) do {if (!advance_array(&output, &allocated, &filled, (x), (y))) return NULL;} while (0) #define PUT_WORD(x) do {WORD w = (x);PUT_BLOCK(&w, 1);} while(0) -#define PUT_DWORD(x) do {DWORD w = (x);PUT_BLOCK(&w, 2);} while(0) const WORD *tmp, *src = (const WORD *)src_tmpl; WORD *output; DWORD allocated, filled; /* in WORDs */ @@ -1313,7 +1357,7 @@ *host = NULL; - This = (IOCS*) GetWindowLongPtrW( hWnd, GWLP_USERDATA ); + This = (IOCS*) GetPropW( hWnd, wine_atl_iocsW ); if ( !This ) { WARN("No container attached to %p\n", hWnd ); @@ -1335,7 +1379,7 @@ *pUnk = NULL; - This = (IOCS*) GetWindowLongPtrW( hWnd, GWLP_USERDATA ); + This = (IOCS*) GetPropW( hWnd, wine_atl_iocsW ); if ( !This || !This->control ) { WARN("No control attached to %p\n", hWnd ); Modified: trunk/reactos/dll/win32/atl/registrar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/registrar.c?… ============================================================================== --- trunk/reactos/dll/win32/atl/registrar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/registrar.c [iso-8859-1] Wed Mar 18 15:30:17 2015 @@ -183,7 +183,7 @@ static HRESULT do_process_key(LPCOLESTR *pstr, HKEY parent_key, strbuf *buf, BOOL do_register) { - LPCOLESTR iter = *pstr; + LPCOLESTR iter; HRESULT hres; LONG lres; HKEY hkey = 0; @@ -379,7 +379,7 @@ { LPCOLESTR iter = data; strbuf buf; - HRESULT hres = S_OK; + HRESULT hres; unsigned int i; strbuf_init(&buf); 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] Wed Mar 18 15:30:17 2015 @@ -52,9 +52,9 @@ reactos/dll/win32/activeds # Synced to Wine-1.7.27 reactos/dll/win32/actxprxy # Synced to Wine-1.7.27 reactos/dll/win32/advpack # Synced to WineStaging-1.7.37 -reactos/dll/win32/atl # Synced to Wine-1.7.27 -reactos/dll/win32/atl80 # Synced to Wine-1.7.27 -reactos/dll/win32/atl100 # Synced to Wine-1.7.27 +reactos/dll/win32/atl # Synced to WineStaging-1.7.37 +reactos/dll/win32/atl80 # Synced to WineStaging-1.7.37 +reactos/dll/win32/atl100 # Synced to WineStaging-1.7.37 reactos/dll/win32/avifil32 # Synced to Wine-1.7.27 reactos/dll/win32/bcrypt # Synced to Wine-1.7.27 reactos/dll/win32/browseui # Out of sync

1 0

[pschweitzer] 66784: [NTOSKRNL] Also partly revert r66781. By Stefan G.
by pschweitzer＠svn.reactos.org 18 Mar '15

18 Mar '15

Author: pschweitzer Date: Wed Mar 18 15:26:46 2015 New Revision: 66784 URL: http://svn.reactos.org/svn/reactos?rev=66784&view=rev Log: [NTOSKRNL] Also partly revert r66781. By Stefan G. Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c trunk/reactos/ntoskrnl/ps/win32.c Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Wed Mar 18 15:26:46 2015 @@ -1673,7 +1673,6 @@ if (!NT_SUCCESS(Result)) { /* Set the last error and fail */ - NtCurrentTeb()->LastErrorValue = RtlNtStatusToDosError(Result); goto ExitCall; } Modified: trunk/reactos/ntoskrnl/ps/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/win32.c?rev=66… ============================================================================== --- trunk/reactos/ntoskrnl/ps/win32.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/win32.c [iso-8859-1] Wed Mar 18 15:26:46 2015 @@ -9,6 +9,7 @@ /* INCLUDES ****************************************************************/ #include <ntoskrnl.h> +#include <winerror.h> #define NDEBUG #include <debug.h> @@ -63,6 +64,7 @@ if (!NewStack) { /* Panic in user-mode */ + NtCurrentTeb()->LastErrorValue = ERROR_NOT_ENOUGH_MEMORY; return STATUS_NO_MEMORY; }

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
50
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 March 2015