August 2020 - Wine-Commits - list.winehq.org

Jacek Caban : include: Add pseudoconsole declarations.
by Alexandre Julliard Aug. 10, 2020

Aug. 10, 2020

Module: wine Branch: master Commit: 7e1957f097d1aa0cd4658b33ef034950e8be1cb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e1957f097d1aa0cd4658b33… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 10 16:05:48 2020 +0200 include: Add pseudoconsole declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/consoleapi.h | 5 +++++ include/wincontypes.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/include/consoleapi.h b/include/consoleapi.h index 439e64eb7b..5bba09d37f 100644 --- a/include/consoleapi.h +++ b/include/consoleapi.h @@ -35,6 +35,8 @@ #define ENABLE_PROCESSED_OUTPUT 0x01 #define ENABLE_WRAP_AT_EOL_OUTPUT 0x02 +#define PSEUDOCONSOLE_INHERIT_CURSOR 0x01 + /* handler routine control signal type */ #define CTRL_C_EVENT 0 #define CTRL_BREAK_EVENT 1 @@ -58,6 +60,8 @@ extern "C" { WINBASEAPI BOOL WINAPI AllocConsole(void); WINBASEAPI BOOL WINAPI AttachConsole(DWORD); +WINBASEAPI void WINAPI ClosePseudoConsole(HPCON); +WINBASEAPI HRESULT WINAPI CreatePseudoConsole(COORD,HANDLE,HANDLE,DWORD,HPCON *); WINBASEAPI BOOL WINAPI FreeConsole(void); WINBASEAPI UINT WINAPI GetConsoleCP(void); WINBASEAPI BOOL WINAPI GetConsoleMode( HANDLE,DWORD *); @@ -72,6 +76,7 @@ WINBASEAPI BOOL WINAPI ReadConsoleW(HANDLE,void *,DWORD,DWORD *,void *); WINBASEAPI BOOL WINAPI ReadConsoleInputA(HANDLE,PINPUT_RECORD,DWORD,DWORD *); WINBASEAPI BOOL WINAPI ReadConsoleInputW(HANDLE,PINPUT_RECORD,DWORD,DWORD *); #define ReadConsoleInput WINELIB_NAME_AW(ReadConsoleInput) +WINBASEAPI HRESULT WINAPI ResizePseudoConsole(HPCON,COORD); WINBASEAPI BOOL WINAPI SetConsoleCtrlHandler( PHANDLER_ROUTINE,BOOL); WINBASEAPI BOOL WINAPI SetConsoleMode( HANDLE,DWORD); WINBASEAPI BOOL WINAPI WriteConsoleA(HANDLE,const void *,DWORD,DWORD *,void *); diff --git a/include/wincontypes.h b/include/wincontypes.h index e416c448a3..d724a80921 100644 --- a/include/wincontypes.h +++ b/include/wincontypes.h @@ -130,4 +130,6 @@ typedef struct _CONSOLE_FONT_INFO COORD dwFontSize; } CONSOLE_FONT_INFO,*LPCONSOLE_FONT_INFO; +typedef void *HPCON; + #endif /* _WINCONTYPES_ */

1 0

Jactry Zeng : d3dx11: Partially implement D3DX11CompileFromFile{A, W}().
by Alexandre Julliard Aug. 10, 2020

Aug. 10, 2020

Module: wine Branch: master Commit: cb8de48f7788270d6b581893d45742ef0757fbee URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb8de48f7788270d6b581893… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Aug 10 17:41:15 2020 +0200 d3dx11: Partially implement D3DX11CompileFromFile{A, W}(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_43/async.c | 29 ++++-- dlls/d3dx11_43/tests/d3dx11.c | 202 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 225 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx11_43/async.c b/dlls/d3dx11_43/async.c index cde87cec60..ee20602310 100644 --- a/dlls/d3dx11_43/async.c +++ b/dlls/d3dx11_43/async.c @@ -236,24 +236,41 @@ HRESULT WINAPI D3DX11CompileFromFileA(const char *filename, const D3D10_SHADER_M ID3D10Include *include, const char *entry_point, const char *target, UINT sflags, UINT eflags, ID3DX11ThreadPump *pump, ID3D10Blob **shader, ID3D10Blob **error_messages, HRESULT *hresult) { - FIXME("filename %s, defines %p, include %p, entry_point %s, target %s, sflags %#x, " - "eflags %#x, pump %p, shader %p, error_messages %p, hresult %p stub.\n", + WCHAR filename_w[MAX_PATH]; + + TRACE("filename %s, defines %p, include %p, entry_point %s, target %s, sflags %#x, " + "eflags %#x, pump %p, shader %p, error_messages %p, hresult %p.\n", debugstr_a(filename), defines, include, debugstr_a(entry_point), debugstr_a(target), sflags, eflags, pump, shader, error_messages, hresult); - return E_NOTIMPL; + MultiByteToWideChar(CP_ACP, 0, filename, -1, filename_w, ARRAY_SIZE(filename_w)); + + return D3DX11CompileFromFileW(filename_w, defines, include, entry_point, target, + sflags, eflags, pump, shader, error_messages, hresult); } HRESULT WINAPI D3DX11CompileFromFileW(const WCHAR *filename, const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *entry_point, const char *target, UINT sflags, UINT eflags, ID3DX11ThreadPump *pump, ID3D10Blob **shader, ID3D10Blob **error_messages, HRESULT *hresult) { - FIXME("filename %s, defines %p, include %p, entry_point %s, target %s, sflags %#x, " - "eflags %#x, pump %p, shader %p, error_messages %p, hresult %p stub.\n", + HRESULT hr; + + TRACE("filename %s, defines %p, include %p, entry_point %s, target %s, sflags %#x, " + "eflags %#x, pump %p, shader %p, error_messages %p, hresult %p.\n", debugstr_w(filename), defines, include, debugstr_a(entry_point), debugstr_a(target), sflags, eflags, pump, shader, error_messages, hresult); - return E_NOTIMPL; + if (pump) + FIXME("Unimplemented ID3DX11ThreadPump handling.\n"); + + if (!include) + include = D3D_COMPILE_STANDARD_FILE_INCLUDE; + + hr = D3DCompileFromFile(filename, defines, include, entry_point, target, sflags, eflags, shader, error_messages); + if (hresult) + *hresult = hr; + + return hr; } HRESULT WINAPI D3DX11CreateAsyncMemoryLoader(const void *data, SIZE_T data_size, ID3DX11DataLoader **loader) diff --git a/dlls/d3dx11_43/tests/d3dx11.c b/dlls/d3dx11_43/tests/d3dx11.c index f7ced893b0..db06c97144 100644 --- a/dlls/d3dx11_43/tests/d3dx11.c +++ b/dlls/d3dx11_43/tests/d3dx11.c @@ -21,6 +21,64 @@ #include "d3d11.h" #include "d3dx11.h" #include "wine/test.h" +#include "wine/heap.h" + +static WCHAR temp_dir[MAX_PATH]; + +static BOOL create_file(const WCHAR *filename, const char *data, unsigned int size, WCHAR *out_path) +{ + WCHAR path[MAX_PATH]; + DWORD written; + HANDLE file; + + if (!temp_dir[0]) + GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); + lstrcpyW(path, temp_dir); + lstrcatW(path, filename); + + file = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + if (file == INVALID_HANDLE_VALUE) + return FALSE; + + if (WriteFile(file, data, size, &written, NULL)) + { + CloseHandle(file); + + if (out_path) + lstrcpyW(out_path, path); + return TRUE; + } + + CloseHandle(file); + return FALSE; +} + +static void delete_file(const WCHAR *filename) +{ + WCHAR path[MAX_PATH]; + + lstrcpyW(path, temp_dir); + lstrcatW(path, filename); + DeleteFileW(path); +} + +static BOOL create_directory(const WCHAR *dir) +{ + WCHAR path[MAX_PATH]; + + lstrcpyW(path, temp_dir); + lstrcatW(path, dir); + return CreateDirectoryW(path, NULL); +} + +static void delete_directory(const WCHAR *dir) +{ + WCHAR path[MAX_PATH]; + + lstrcpyW(path, temp_dir); + lstrcatW(path, dir); + RemoveDirectoryW(path); +} static void test_D3DX11CreateAsyncMemoryLoader(void) { @@ -205,9 +263,153 @@ static void test_D3DX11CreateAsyncResourceLoader(void) ok(hr == D3DX11_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); } +static HRESULT WINAPI test_d3dinclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE include_type, + const char *filename, const void *parent_data, const void **data, UINT *bytes) +{ + static const char include1[] = + "#define LIGHT float4(0.0f, 0.2f, 0.5f, 1.0f)\n"; + static const char include2[] = + "#include \"include1.h\"\n" + "float4 light_color = LIGHT;\n"; + char *buffer; + + trace("filename %s.\n", filename); + trace("parent_data %p: %s.\n", parent_data, parent_data ? (char *)parent_data : "(null)"); + + if (!strcmp(filename, "include1.h")) + { + buffer = heap_alloc(strlen(include1)); + CopyMemory(buffer, include1, strlen(include1)); + *bytes = strlen(include1); + ok(include_type == D3D_INCLUDE_LOCAL, "Unexpected include type %d.\n", include_type); + ok(!strncmp(include2, parent_data, strlen(include2)), + "Unexpected parent_data value.\n"); + } + else if (!strcmp(filename, "include\\include2.h")) + { + buffer = heap_alloc(strlen(include2)); + CopyMemory(buffer, include2, strlen(include2)); + *bytes = strlen(include2); + ok(!parent_data, "Unexpected parent_data value.\n"); + ok(include_type == D3D_INCLUDE_LOCAL, "Unexpected include type %d.\n", include_type); + } + else + { + ok(0, "Unexpected #include for file %s.\n", filename); + return E_INVALIDARG; + } + + *data = buffer; + return S_OK; +} + +static HRESULT WINAPI test_d3dinclude_close(ID3DInclude *iface, const void *data) +{ + heap_free((void *)data); + return S_OK; +} + +static const struct ID3DIncludeVtbl test_d3dinclude_vtbl = +{ + test_d3dinclude_open, + test_d3dinclude_close +}; + +struct test_d3dinclude +{ + ID3DInclude ID3DInclude_iface; +}; + +static void test_D3DX11CompileFromFile(void) +{ + struct test_d3dinclude include = {{&test_d3dinclude_vtbl}}; + WCHAR filename[MAX_PATH], directory[MAX_PATH]; + ID3D10Blob *blob = NULL, *errors = NULL; + CHAR filename_a[MAX_PATH]; + HRESULT hr, result; + DWORD len; + static const char ps_code[] = + "#include \"include\\include2.h\"\n" + "\n" + "float4 main() : COLOR\n" + "{\n" + " return light_color;\n" + "}"; + static const char include1[] = + "#define LIGHT float4(0.0f, 0.2f, 0.5f, 1.0f)\n"; + static const char include1_wrong[] = + "#define LIGHT nope\n"; + static const char include2[] = + "#include \"include1.h\"\n" + "float4 light_color = LIGHT;\n"; + + create_file(L"source.ps", ps_code, strlen(ps_code), filename); + create_directory(L"include"); + create_file(L"include\\include1.h", include1_wrong, strlen(include1_wrong), NULL); + create_file(L"include1.h", include1, strlen(include1), NULL); + create_file(L"include\\include2.h", include2, strlen(include2), NULL); + + hr = D3DX11CompileFromFileW(filename, NULL, &include.ID3DInclude_iface, "main", "ps_2_0", 0, 0, NULL, &blob, &errors, &result); + todo_wine ok(hr == S_OK && hr == result, "Got hr %#x, result %#x.\n", hr, result); + todo_wine ok(!!blob, "Got unexpected blob.\n"); + ok(!errors, "Got unexpected errors.\n"); + if (blob) + { + ID3D10Blob_Release(blob); + blob = NULL; + } + + /* Windows always seems to resolve includes from the initial file location + * instead of using the immediate parent, as it would be the case for + * standard C preprocessor includes. */ + hr = D3DX11CompileFromFileW(filename, NULL, NULL, "main", "ps_2_0", 0, 0, NULL, &blob, &errors, &result); + todo_wine ok(hr == S_OK && hr == result, "Got hr %#x, result %#x.\n", hr, result); + todo_wine ok(!!blob, "Got unexpected blob.\n"); + ok(!errors, "Got unexpected errors.\n"); + if (blob) + { + ID3D10Blob_Release(blob); + blob = NULL; + } + + len = WideCharToMultiByte(CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, len, NULL, NULL); + hr = D3DX11CompileFromFileA(filename_a, NULL, NULL, "main", "ps_2_0", 0, 0, NULL, &blob, &errors, &result); + todo_wine ok(hr == S_OK && hr == result, "Got hr %#x, result %#x.\n", hr, result); + todo_wine ok(!!blob, "Got unexpected blob.\n"); + ok(!errors, "Got unexpected errors.\n"); + if (blob) + { + ID3D10Blob_Release(blob); + blob = NULL; + } + + GetCurrentDirectoryW(MAX_PATH, directory); + SetCurrentDirectoryW(temp_dir); + + hr = D3DX11CompileFromFileW(L"source.ps", NULL, NULL, "main", "ps_2_0", 0, 0, NULL, &blob, &errors, &result); + todo_wine ok(hr == S_OK && hr == result, "Got hr %#x, result %#x.\n", hr, result); + todo_wine ok(!!blob, "Got unexpected blob.\n"); + ok(!errors, "Got unexpected errors.\n"); + if (blob) + { + ID3D10Blob_Release(blob); + blob = NULL; + } + + SetCurrentDirectoryW(directory); + + delete_file(L"source.ps"); + delete_file(L"include\\include1.h"); + delete_file(L"include1.h"); + delete_file(L"include\\include2.h"); + delete_directory(L"include"); +} + START_TEST(d3dx11) { test_D3DX11CreateAsyncMemoryLoader(); test_D3DX11CreateAsyncFileLoader(); test_D3DX11CreateAsyncResourceLoader(); + test_D3DX11CompileFromFile(); }

1 0

Gijs Vermeulen : wbemprox: Accept 0 and WBEM_FLAG_ALWAYS | WBEM_MASK_CONDITION_ORIGIN as flags in IWbemClassObject::GetNames().
by Alexandre Julliard Aug. 10, 2020

Aug. 10, 2020

Module: wine Branch: master Commit: 06e455c247c4e7ba56cbdcd636e165418490b299 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06e455c247c4e7ba56cbdcd6… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Aug 10 12:09:10 2020 +0200 wbemprox: Accept 0 and WBEM_FLAG_ALWAYS | WBEM_MASK_CONDITION_ORIGIN as flags in IWbemClassObject::GetNames(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34770 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/class.c | 12 ++++++++++-- dlls/wbemprox/tests/query.c | 15 +++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index db6017e0c9..1a00cfc40a 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -484,13 +484,21 @@ static HRESULT WINAPI class_object_GetNames( TRACE("%p, %s, %08x, %s, %p\n", iface, debugstr_w(wszQualifierName), lFlags, debugstr_variant(pQualifierVal), pNames); - if (lFlags != WBEM_FLAG_ALWAYS && + if (!pNames) + return WBEM_E_INVALID_PARAMETER; + + /* Combination used in a handful of broken apps */ + if (lFlags == (WBEM_FLAG_ALWAYS | WBEM_MASK_CONDITION_ORIGIN)) + lFlags = WBEM_FLAG_ALWAYS; + + if (lFlags && (lFlags != WBEM_FLAG_ALWAYS && lFlags != WBEM_FLAG_NONSYSTEM_ONLY && - lFlags != WBEM_FLAG_SYSTEM_ONLY) + lFlags != WBEM_FLAG_SYSTEM_ONLY)) { FIXME("flags %08x not supported\n", lFlags); return E_NOTIMPL; } + if (wszQualifierName || pQualifierVal) FIXME("qualifier not supported\n"); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index a50002e1ba..d6c918c08d 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1015,6 +1015,21 @@ static void test_GetNames( IWbemServices *services ) IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (!count) break; + hr = IWbemClassObject_GetNames( obj, NULL, 0, NULL, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + + hr = IWbemClassObject_GetNames( obj, NULL, 0, NULL, &names ); + ok( hr == S_OK, "got %08x\n", hr ); + SafeArrayDestroy( names ); + + hr = IWbemClassObject_GetNames( obj, NULL, WBEM_FLAG_ALWAYS, NULL, &names ); + ok( hr == S_OK, "got %08x\n", hr ); + SafeArrayDestroy( names ); + + hr = IWbemClassObject_GetNames( obj, NULL, WBEM_FLAG_ALWAYS | WBEM_MASK_CONDITION_ORIGIN, NULL, &names ); + ok( hr == S_OK, "got %08x\n", hr ); + SafeArrayDestroy( names ); + VariantInit( &val ); hr = IWbemClassObject_GetNames( obj, NULL, WBEM_FLAG_NONSYSTEM_ONLY, &val, &names ); ok( hr == S_OK, "got %08x\n", hr );

1 0

Nikolay Sivov : combase: Move CoGetInstanceFromIStorage().
by Alexandre Julliard Aug. 10, 2020

Aug. 10, 2020

Module: wine Branch: master Commit: 93e7afb41f524286ff14e9d2df30a8e7aa4940df URL: https://source.winehq.org/git/wine.git/?a=commit;h=93e7afb41f524286ff14e9d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 10 11:12:47 2020 +0300 combase: Move CoGetInstanceFromIStorage(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 50 +++++++++++++++++++++++++++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 63 ----------------------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 52 insertions(+), 65 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 06fc97e17d..88da5fb888 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -725,3 +725,53 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetInstanceFromFile(COSERVERINFO *server_info return hr; } } + +/*********************************************************************** + * CoGetInstanceFromIStorage (combase.@) + */ +HRESULT WINAPI CoGetInstanceFromIStorage(COSERVERINFO *server_info, CLSID *rclsid, + IUnknown *outer, DWORD cls_context, IStorage *storage, DWORD count, MULTI_QI *results) +{ + IPersistStorage *ps = NULL; + IUnknown *obj = NULL; + STATSTG stat; + HRESULT hr; + + if (!count || !results || !storage) + return E_INVALIDARG; + + if (server_info) + FIXME("() non-NULL server_info not supported\n"); + + init_multi_qi(count, results, E_NOINTERFACE); + + if (!rclsid) + { + memset(&stat.clsid, 0, sizeof(stat.clsid)); + hr = IStorage_Stat(storage, &stat, STATFLAG_NONAME); + if (FAILED(hr)) + { + ERR("Failed to get CLSID from a storage.\n"); + return hr; + } + + rclsid = &stat.clsid; + } + + hr = CoCreateInstance(rclsid, outer, cls_context, &IID_IUnknown, (void **)&obj); + if (hr != S_OK) + return hr; + + /* Init from IStorage */ + hr = IUnknown_QueryInterface(obj, &IID_IPersistStorage, (void **)&ps); + if (FAILED(hr)) + ERR("failed to get IPersistStorage\n"); + + if (ps) + { + IPersistStorage_Load(ps, storage); + IPersistStorage_Release(ps); + } + + return return_multi_qi(obj, count, results, FALSE); +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index e90df05446..de0ebe7cd3 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -108,7 +108,7 @@ @ stdcall CoGetDefaultContext(long ptr ptr) ole32.CoGetDefaultContext @ stub CoGetErrorInfo @ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) -@ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) ole32.CoGetInstanceFromIStorage +@ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) @ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) ole32.CoGetInterfaceAndReleaseStream @ stdcall CoGetMalloc(long ptr) @ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) ole32.CoGetMarshalSizeMax diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 1ad8a4b1d1..e63759c060 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3434,69 +3434,6 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx( return return_multi_qi(unk, cmq, pResults, TRUE); } -/*********************************************************************** - * CoGetInstanceFromIStorage [OLE32.@] - */ -HRESULT WINAPI CoGetInstanceFromIStorage( - COSERVERINFO *server_info, - CLSID *rclsid, - IUnknown *outer, - DWORD cls_context, - IStorage *storage, - DWORD count, - MULTI_QI *results -) -{ - IPersistStorage *ps = NULL; - IUnknown* unk = NULL; - STATSTG stat; - HRESULT hr; - - if (count == 0 || !results || !storage) - return E_INVALIDARG; - - if (server_info) - FIXME("() non-NULL server_info not supported\n"); - - init_multi_qi(count, results, E_NOINTERFACE); - - /* optionally get CLSID from a file */ - if (!rclsid) - { - memset(&stat.clsid, 0, sizeof(stat.clsid)); - hr = IStorage_Stat(storage, &stat, STATFLAG_NONAME); - if (FAILED(hr)) - { - ERR("failed to get CLSID from a file\n"); - return hr; - } - - rclsid = &stat.clsid; - } - - hr = CoCreateInstance(rclsid, - outer, - cls_context, - &IID_IUnknown, - (void**)&unk); - - if (hr != S_OK) - return hr; - - /* init from IStorage */ - hr = IUnknown_QueryInterface(unk, &IID_IPersistStorage, (void**)&ps); - if (FAILED(hr)) - ERR("failed to get IPersistStorage\n"); - - if (ps) - { - IPersistStorage_Load(ps, storage); - IPersistStorage_Release(ps); - } - - return return_multi_qi(unk, count, results, FALSE); -} - /*********************************************************************** * CoLoadLibrary (OLE32.@) * diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index b1949eec8e..6f44e298af 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -36,7 +36,7 @@ @ stdcall CoGetCurrentProcess() @ stdcall CoGetDefaultContext(long ptr ptr) @ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) combase.CoGetInstanceFromFile -@ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) +@ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) combase.CoGetInstanceFromIStorage @ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) @ stdcall CoGetMalloc(long ptr) combase.CoGetMalloc @ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long)

1 0

Nikolay Sivov : combase: Move CoCreateInstance().
by Alexandre Julliard Aug. 10, 2020

Aug. 10, 2020

Module: wine Branch: master Commit: 9fa68c5d298274bd2aba47a0062ccffbf73259ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fa68c5d298274bd2aba47a0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 10 11:12:48 2020 +0300 combase: Move CoCreateInstance(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 19 +++++++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 52 ----------------------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 21 insertions(+), 54 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 88da5fb888..bcf9912cbc 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -775,3 +775,22 @@ HRESULT WINAPI CoGetInstanceFromIStorage(COSERVERINFO *server_info, CLSID *rclsi return return_multi_qi(obj, count, results, FALSE); } + +/*********************************************************************** + * CoCreateInstance (combase.@) + */ +HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstance(REFCLSID rclsid, IUnknown *outer, DWORD cls_context, + REFIID riid, void **obj) +{ + MULTI_QI multi_qi = { .pIID = riid }; + HRESULT hr; + + TRACE("%s, %p, %#x, %s, %p.\n", debugstr_guid(rclsid), outer, cls_context, debugstr_guid(riid), obj); + + if (!obj) + return E_POINTER; + + hr = CoCreateInstanceEx(rclsid, outer, cls_context, NULL, 1, &multi_qi); + *obj = multi_qi.pItf; + return hr; +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index de0ebe7cd3..b8e374924a 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -79,7 +79,7 @@ @ stdcall CoCreateErrorInfo(ptr) CreateErrorInfo @ stdcall CoCreateFreeThreadedMarshaler(ptr ptr) ole32.CoCreateFreeThreadedMarshaler @ stdcall CoCreateGuid(ptr) -@ stdcall CoCreateInstance(ptr ptr long ptr ptr) ole32.CoCreateInstance +@ stdcall CoCreateInstance(ptr ptr long ptr ptr) @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) ole32.CoCreateInstanceEx @ stub CoCreateInstanceFromApp @ stub CoCreateObjectInContext diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index e63759c060..cc64d7c036 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3263,58 +3263,6 @@ HRESULT WINAPI CoResumeClassObjects(void) return S_OK; } -/*********************************************************************** - * CoCreateInstance [OLE32.@] - * - * Creates an instance of the specified class. - * - * PARAMS - * rclsid [I] Class ID to create an instance of. - * pUnkOuter [I] Optional outer unknown to allow aggregation with another object. - * dwClsContext [I] Flags to restrict the location of the created instance. - * iid [I] The ID of the interface of the instance to return. - * ppv [O] On returns, contains a pointer to the specified interface of the instance. - * - * RETURNS - * Success: S_OK - * Failure: HRESULT code. - * - * NOTES - * The dwClsContext parameter can be one or more of the following: - *| CLSCTX_INPROC_SERVER - Use an in-process server, such as from a DLL. - *| CLSCTX_INPROC_HANDLER - Use an in-process object which handles certain functions for an object running in another process. - *| CLSCTX_LOCAL_SERVER - Connect to an object running in another process. - *| CLSCTX_REMOTE_SERVER - Connect to an object running on another machine. - * - * Aggregation is the concept of deferring the IUnknown of an object to another - * object. This allows a separate object to behave as though it was part of - * the object and to allow this the pUnkOuter parameter can be set. Note that - * not all objects support having an outer of unknown. - * - * SEE ALSO - * CoGetClassObject() - */ -HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstance( - REFCLSID rclsid, - LPUNKNOWN pUnkOuter, - DWORD dwClsContext, - REFIID iid, - LPVOID *ppv) -{ - MULTI_QI multi_qi = { iid }; - HRESULT hres; - - TRACE("(rclsid=%s, pUnkOuter=%p, dwClsContext=%08x, riid=%s, ppv=%p)\n", debugstr_guid(rclsid), - pUnkOuter, dwClsContext, debugstr_guid(iid), ppv); - - if (ppv==0) - return E_POINTER; - - hres = CoCreateInstanceEx(rclsid, pUnkOuter, dwClsContext, NULL, 1, &multi_qi); - *ppv = multi_qi.pItf; - return hres; -} - static void init_multi_qi(DWORD count, MULTI_QI *mqi, HRESULT hr) { ULONG i; diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 6f44e298af..550b3149d4 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -12,7 +12,7 @@ @ stdcall CoCopyProxy(ptr ptr) combase.CoCopyProxy @ stdcall CoCreateFreeThreadedMarshaler(ptr ptr) @ stdcall CoCreateGuid(ptr) combase.CoCreateGuid -@ stdcall CoCreateInstance(ptr ptr long ptr ptr) +@ stdcall CoCreateInstance(ptr ptr long ptr ptr) combase.CoCreateInstance @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) @ stdcall CoDecrementMTAUsage(ptr) @ stdcall CoDisableCallCancellation(ptr)

1 0

Nikolay Sivov : combase: Move CoGetTreatAsClass().
by Alexandre Julliard Aug. 10, 2020

Aug. 10, 2020

Module: wine Branch: master Commit: ea8d11a8e54989cb3f98562d48a6a7054f387226 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea8d11a8e54989cb3f98562d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 10 11:12:49 2020 +0300 combase: Move CoGetTreatAsClass(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 203 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 50 ------------ dlls/ole32/ole32.spec | 2 +- 4 files changed, 205 insertions(+), 52 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index bcf9912cbc..a757407c71 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -20,14 +20,179 @@ #define COBJMACROS #define NONAMELESSUNION +#include "ntstatus.h" +#define WIN32_NO_STATUS #define USE_COM_CONTEXT_DEF #include "objbase.h" #include "oleauto.h" +#include "winternl.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); +#define CHARS_IN_GUID 39 + +static NTSTATUS create_key(HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr) +{ + NTSTATUS status = NtCreateKey((HANDLE *)retkey, access, attr, 0, NULL, 0, NULL); + + if (status == STATUS_OBJECT_NAME_NOT_FOUND) + { + HANDLE subkey, root = attr->RootDirectory; + WCHAR *buffer = attr->ObjectName->Buffer; + DWORD attrs, pos = 0, i = 0, len = attr->ObjectName->Length / sizeof(WCHAR); + UNICODE_STRING str; + + while (i < len && buffer[i] != '\\') i++; + if (i == len) return status; + + attrs = attr->Attributes; + attr->ObjectName = &str; + + while (i < len) + { + str.Buffer = buffer + pos; + str.Length = (i - pos) * sizeof(WCHAR); + status = NtCreateKey(&subkey, access, attr, 0, NULL, 0, NULL); + if (attr->RootDirectory != root) NtClose(attr->RootDirectory); + if (status) return status; + attr->RootDirectory = subkey; + while (i < len && buffer[i] == '\\') i++; + pos = i; + while (i < len && buffer[i] != '\\') i++; + } + str.Buffer = buffer + pos; + str.Length = (i - pos) * sizeof(WCHAR); + attr->Attributes = attrs; + status = NtCreateKey((HANDLE *)retkey, access, attr, 0, NULL, 0, NULL); + if (attr->RootDirectory != root) NtClose(attr->RootDirectory); + } + return status; +} + +static HKEY classes_root_hkey; + +static HKEY create_classes_root_hkey(DWORD access) +{ + HKEY hkey, ret = 0; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING name; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &name; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString(&name, L"\\Registry\\Machine\\Software\\Classes"); + + if (create_key( &hkey, access, &attr )) return 0; + TRACE( "%s -> %p\n", debugstr_w(attr.ObjectName->Buffer), hkey ); + + if (!(access & KEY_WOW64_64KEY)) + { + if (!(ret = InterlockedCompareExchangePointer( (void **)&classes_root_hkey, hkey, 0 ))) + ret = hkey; + else + NtClose( hkey ); /* somebody beat us to it */ + } + else + ret = hkey; + return ret; +} + +static HKEY get_classes_root_hkey(HKEY hkey, REGSAM access); + +static LSTATUS create_classes_key(HKEY hkey, const WCHAR *name, REGSAM access, HKEY *retkey) +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + + if (!(hkey = get_classes_root_hkey(hkey, access))) + return ERROR_INVALID_HANDLE; + + attr.Length = sizeof(attr); + attr.RootDirectory = hkey; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &nameW, name ); + + return RtlNtStatusToDosError(create_key(retkey, access, &attr)); +} + +static HKEY get_classes_root_hkey(HKEY hkey, REGSAM access) +{ + HKEY ret = hkey; + const BOOL is_win64 = sizeof(void*) > sizeof(int); + const BOOL force_wow32 = is_win64 && (access & KEY_WOW64_32KEY); + + if (hkey == HKEY_CLASSES_ROOT && + ((access & KEY_WOW64_64KEY) || !(ret = classes_root_hkey))) + ret = create_classes_root_hkey(MAXIMUM_ALLOWED | (access & KEY_WOW64_64KEY)); + if (force_wow32 && ret && ret == classes_root_hkey) + { + access &= ~KEY_WOW64_32KEY; + if (create_classes_key(classes_root_hkey, L"Wow6432Node", access, &hkey)) + return 0; + ret = hkey; + } + + return ret; +} + +static LSTATUS open_classes_key(HKEY hkey, const WCHAR *name, REGSAM access, HKEY *retkey) +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + + if (!(hkey = get_classes_root_hkey(hkey, access))) + return ERROR_INVALID_HANDLE; + + attr.Length = sizeof(attr); + attr.RootDirectory = hkey; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &nameW, name ); + + return RtlNtStatusToDosError(NtOpenKey((HANDLE *)retkey, access, &attr)); +} + +static HRESULT open_key_for_clsid(REFCLSID clsid, const WCHAR *keyname, REGSAM access, HKEY *subkey) +{ + static const WCHAR clsidW[] = L"CLSID\\"; + WCHAR path[CHARS_IN_GUID + ARRAY_SIZE(clsidW) - 1]; + LONG res; + HKEY key; + + lstrcpyW(path, clsidW); + StringFromGUID2(clsid, path + lstrlenW(clsidW), CHARS_IN_GUID); + res = open_classes_key(HKEY_CLASSES_ROOT, path, keyname ? KEY_READ : access, &key); + if (res == ERROR_FILE_NOT_FOUND) + return REGDB_E_CLASSNOTREG; + else if (res != ERROR_SUCCESS) + return REGDB_E_READREGDB; + + if (!keyname) + { + *subkey = key; + return S_OK; + } + + res = open_classes_key(key, keyname, access, subkey); + RegCloseKey(key); + if (res == ERROR_FILE_NOT_FOUND) + return REGDB_E_KEYMISSING; + else if (res != ERROR_SUCCESS) + return REGDB_E_READREGDB; + + return S_OK; +} + /*********************************************************************** * FreePropVariantArray (combase.@) */ @@ -628,6 +793,44 @@ HRESULT WINAPI CoGetActivationState(GUID guid, DWORD arg2, DWORD *arg3) return E_NOTIMPL; } +/****************************************************************************** + * CoGetTreatAsClass (combase.@) + */ +HRESULT WINAPI CoGetTreatAsClass(REFCLSID clsidOld, CLSID *clsidNew) +{ + WCHAR buffW[CHARS_IN_GUID]; + LONG len = sizeof(buffW); + HRESULT hr = S_OK; + HKEY hkey = NULL; + + TRACE("%s, %p.\n", debugstr_guid(clsidOld), clsidNew); + + if (!clsidOld || !clsidNew) + return E_INVALIDARG; + + *clsidNew = *clsidOld; + + hr = open_key_for_clsid(clsidOld, L"TreatAs", KEY_READ, &hkey); + if (FAILED(hr)) + { + hr = S_FALSE; + goto done; + } + + if (RegQueryValueW(hkey, NULL, buffW, &len)) + { + hr = S_FALSE; + goto done; + } + + hr = CLSIDFromString(buffW, clsidNew); + if (FAILED(hr)) + ERR("Failed to get CLSID from string %s, hr %#x.\n", debugstr_w(buffW), hr); +done: + if (hkey) RegCloseKey(hkey); + return hr; +} + static void init_multi_qi(DWORD count, MULTI_QI *mqi, HRESULT hr) { ULONG i; diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index b8e374924a..497af6da8c 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -119,7 +119,7 @@ @ stdcall CoGetStandardMarshal(ptr ptr long ptr long ptr) ole32.CoGetStandardMarshal @ stub CoGetStdMarshalEx @ stub CoGetSystemSecurityPermissions -@ stdcall CoGetTreatAsClass(ptr ptr) ole32.CoGetTreatAsClass +@ stdcall CoGetTreatAsClass(ptr ptr) @ stdcall CoImpersonateClient() @ stdcall CoIncrementMTAUsage(ptr) ole32.CoIncrementMTAUsage @ stdcall CoInitializeEx(ptr long) ole32.CoInitializeEx diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index cc64d7c036..1f6a952f15 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3707,56 +3707,6 @@ done: return res; } -/****************************************************************************** - * CoGetTreatAsClass [OLE32.@] - * - * Gets the TreatAs value of a class. - * - * PARAMS - * clsidOld [I] Class to get the TreatAs value of. - * clsidNew [I] The class the clsidOld should be treated as. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - * - * SEE ALSO - * CoSetTreatAsClass - */ -HRESULT WINAPI CoGetTreatAsClass(REFCLSID clsidOld, LPCLSID clsidNew) -{ - static const WCHAR wszTreatAs[] = {'T','r','e','a','t','A','s',0}; - HKEY hkey = NULL; - WCHAR szClsidNew[CHARS_IN_GUID]; - HRESULT res = S_OK; - LONG len = sizeof(szClsidNew); - - TRACE("(%s,%p)\n", debugstr_guid(clsidOld), clsidNew); - - if (!clsidOld || !clsidNew) - return E_INVALIDARG; - - *clsidNew = *clsidOld; /* copy over old value */ - - res = COM_OpenKeyForCLSID(clsidOld, wszTreatAs, KEY_READ, &hkey); - if (FAILED(res)) - { - res = S_FALSE; - goto done; - } - if (RegQueryValueW(hkey, NULL, szClsidNew, &len)) - { - res = S_FALSE; - goto done; - } - res = CLSIDFromString(szClsidNew,clsidNew); - if (FAILED(res)) - ERR("Failed CLSIDFromStringA(%s), hres 0x%08x\n", debugstr_w(szClsidNew), res); -done: - if (hkey) RegCloseKey(hkey); - return res; -} - /****************************************************************************** * CoGetCurrentProcess [OLE32.@] */ diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 550b3149d4..e51b2b5887 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -46,7 +46,7 @@ @ stdcall CoGetStandardMarshal(ptr ptr long ptr long ptr) @ stdcall CoGetState(ptr) @ stub CoGetTIDFromIPID -@ stdcall CoGetTreatAsClass(ptr ptr) +@ stdcall CoGetTreatAsClass(ptr ptr) combase.CoGetTreatAsClass @ stdcall CoImpersonateClient() combase.CoImpersonateClient @ stdcall CoIncrementMTAUsage(ptr) @ stdcall CoInitialize(ptr)

1 0

Nikolay Sivov : combase: Move ProgIDFromCLSID().
by Alexandre Julliard Aug. 10, 2020

Aug. 10, 2020

Module: wine Branch: master Commit: 0213ebefbef39e0766ce56a1e60a41a2edbb8421 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0213ebefbef39e0766ce56a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 10 11:12:50 2020 +0300 combase: Move ProgIDFromCLSID(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 73 ---------------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 86 insertions(+), 75 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index a757407c71..6b8eb4ee7a 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -33,6 +33,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); #define CHARS_IN_GUID 39 +struct comclassredirect_data +{ + ULONG size; + ULONG flags; + DWORD model; + GUID clsid; + GUID alias; + GUID clsid2; + GUID tlbid; + ULONG name_len; + ULONG name_offset; + ULONG progid_len; + ULONG progid_offset; + ULONG clrdata_len; + ULONG clrdata_offset; + DWORD miscstatus; + DWORD miscstatuscontent; + DWORD miscstatusthumbnail; + DWORD miscstatusicon; + DWORD miscstatusdocprint; +}; + static NTSTATUS create_key(HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr) { NTSTATUS status = NtCreateKey((HANDLE *)retkey, access, attr, 0, NULL, 0, NULL); @@ -831,6 +853,68 @@ done: return hr; } +/****************************************************************************** + * ProgIDFromCLSID (combase.@) + */ +HRESULT WINAPI DECLSPEC_HOTPATCH ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *progid) +{ + ACTCTX_SECTION_KEYED_DATA data; + LONG progidlen = 0; + HKEY hkey; + HRESULT hr; + + if (!progid) + return E_INVALIDARG; + + *progid = NULL; + + data.cbSize = sizeof(data); + if (FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, + clsid, &data)) + { + struct comclassredirect_data *comclass = (struct comclassredirect_data *)data.lpData; + if (comclass->progid_len) + { + WCHAR *ptrW; + + *progid = CoTaskMemAlloc(comclass->progid_len + sizeof(WCHAR)); + if (!*progid) return E_OUTOFMEMORY; + + ptrW = (WCHAR *)((BYTE *)comclass + comclass->progid_offset); + memcpy(*progid, ptrW, comclass->progid_len + sizeof(WCHAR)); + return S_OK; + } + else + return REGDB_E_CLASSNOTREG; + } + + hr = open_key_for_clsid(clsid, L"ProgID", KEY_READ, &hkey); + if (FAILED(hr)) + return hr; + + if (RegQueryValueW(hkey, NULL, NULL, &progidlen)) + hr = REGDB_E_CLASSNOTREG; + + if (hr == S_OK) + { + *progid = CoTaskMemAlloc(progidlen * sizeof(WCHAR)); + if (*progid) + { + if (RegQueryValueW(hkey, NULL, *progid, &progidlen)) + { + hr = REGDB_E_CLASSNOTREG; + CoTaskMemFree(*progid); + *progid = NULL; + } + } + else + hr = E_OUTOFMEMORY; + } + + RegCloseKey(hkey); + return hr; +} + static void init_multi_qi(DWORD count, MULTI_QI *mqi, HRESULT hr) { ULONG i; diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 497af6da8c..a90a418764 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -279,7 +279,7 @@ @ stub NdrExtStubInitialize @ stub NdrOleDllGetClassObject @ stub NdrpFindInterface -@ stdcall ProgIDFromCLSID(ptr ptr) ole32.ProgIDFromCLSID +@ stdcall ProgIDFromCLSID(ptr ptr) @ stdcall PropVariantClear(ptr) @ stdcall PropVariantCopy(ptr ptr) @ stub ReleaseFuncDescs diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 1f6a952f15..47b815b752 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2485,79 +2485,6 @@ HRESULT COM_OpenKeyForAppIdFromCLSID(REFCLSID clsid, REGSAM access, HKEY *subkey return S_OK; } -/****************************************************************************** - * ProgIDFromCLSID [OLE32.@] - * - * Converts a class id into the respective program ID. - * - * PARAMS - * clsid [I] Class ID, as found in registry. - * ppszProgID [O] Associated ProgID. - * - * RETURNS - * S_OK - * E_OUTOFMEMORY - * REGDB_E_CLASSNOTREG if the given clsid has no associated ProgID - */ -HRESULT WINAPI DECLSPEC_HOTPATCH ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *ppszProgID) -{ - static const WCHAR wszProgID[] = {'P','r','o','g','I','D',0}; - ACTCTX_SECTION_KEYED_DATA data; - HKEY hkey; - HRESULT ret; - LONG progidlen = 0; - - if (!ppszProgID) - return E_INVALIDARG; - - *ppszProgID = NULL; - - data.cbSize = sizeof(data); - if (FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, - clsid, &data)) - { - struct comclassredirect_data *comclass = (struct comclassredirect_data*)data.lpData; - if (comclass->progid_len) - { - WCHAR *ptrW; - - *ppszProgID = CoTaskMemAlloc(comclass->progid_len + sizeof(WCHAR)); - if (!*ppszProgID) return E_OUTOFMEMORY; - - ptrW = (WCHAR*)((BYTE*)comclass + comclass->progid_offset); - memcpy(*ppszProgID, ptrW, comclass->progid_len + sizeof(WCHAR)); - return S_OK; - } - else - return REGDB_E_CLASSNOTREG; - } - - ret = COM_OpenKeyForCLSID(clsid, wszProgID, KEY_READ, &hkey); - if (FAILED(ret)) - return ret; - - if (RegQueryValueW(hkey, NULL, NULL, &progidlen)) - ret = REGDB_E_CLASSNOTREG; - - if (ret == S_OK) - { - *ppszProgID = CoTaskMemAlloc(progidlen * sizeof(WCHAR)); - if (*ppszProgID) - { - if (RegQueryValueW(hkey, NULL, *ppszProgID, &progidlen)) { - ret = REGDB_E_CLASSNOTREG; - CoTaskMemFree(*ppszProgID); - *ppszProgID = NULL; - } - } - else - ret = E_OUTOFMEMORY; - } - - RegCloseKey(hkey); - return ret; -} - /****************************************************************************** * CLSIDFromProgID [OLE32.@] * diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index e51b2b5887..74eb6f0106 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -237,7 +237,7 @@ @ stdcall OleTranslateAccelerator(ptr ptr ptr) @ stdcall OleUninitialize() @ stub OpenOrCreateStream -@ stdcall ProgIDFromCLSID(ptr ptr) +@ stdcall ProgIDFromCLSID(ptr ptr) combase.ProgIDFromCLSID @ stdcall PropStgNameToFmtId(wstr ptr) @ stdcall PropSysAllocString(wstr) @ stdcall PropSysFreeString(wstr)

1 0

Nikolay Sivov : combase: Move CLSIDFromProgID().
by Alexandre Julliard Aug. 10, 2020

Aug. 10, 2020

Module: wine Branch: master Commit: d271b9ff73e8c9fe18a513517e144a799b65e171 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d271b9ff73e8c9fe18a51351… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 10 11:12:51 2020 +0300 combase: Move CLSIDFromProgID(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 33 ----------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 140 insertions(+), 35 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 6b8eb4ee7a..2d202c796d 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -28,6 +28,7 @@ #include "winternl.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -55,6 +56,13 @@ struct comclassredirect_data DWORD miscstatusdocprint; }; +struct progidredirect_data +{ + ULONG size; + DWORD reserved; + ULONG clsid_offset; +}; + static NTSTATUS create_key(HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr) { NTSTATUS status = NtCreateKey((HANDLE *)retkey, access, attr, 0, NULL, 0, NULL); @@ -915,6 +923,136 @@ HRESULT WINAPI DECLSPEC_HOTPATCH ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *progi return hr; } +static inline BOOL is_valid_hex(WCHAR c) +{ + if (!(((c >= '0') && (c <= '9')) || + ((c >= 'a') && (c <= 'f')) || + ((c >= 'A') && (c <= 'F')))) + return FALSE; + return TRUE; +} + +static const BYTE guid_conv_table[256] = +{ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x00 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x10 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x20 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, /* 0x30 */ + 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x40 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x50 */ + 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf /* 0x60 */ +}; + +static BOOL guid_from_string(LPCWSTR s, GUID *id) +{ + int i; + + if (!s || s[0] != '{') + { + memset(id, 0, sizeof(*id)); + if (!s) return TRUE; + return FALSE; + } + + TRACE("%s -> %p\n", debugstr_w(s), id); + + /* In form {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} */ + + id->Data1 = 0; + for (i = 1; i < 9; ++i) + { + if (!is_valid_hex(s[i])) return FALSE; + id->Data1 = (id->Data1 << 4) | guid_conv_table[s[i]]; + } + if (s[9] != '-') return FALSE; + + id->Data2 = 0; + for (i = 10; i < 14; ++i) + { + if (!is_valid_hex(s[i])) return FALSE; + id->Data2 = (id->Data2 << 4) | guid_conv_table[s[i]]; + } + if (s[14] != '-') return FALSE; + + id->Data3 = 0; + for (i = 15; i < 19; ++i) + { + if (!is_valid_hex(s[i])) return FALSE; + id->Data3 = (id->Data3 << 4) | guid_conv_table[s[i]]; + } + if (s[19] != '-') return FALSE; + + for (i = 20; i < 37; i += 2) + { + if (i == 24) + { + if (s[i] != '-') return FALSE; + i++; + } + if (!is_valid_hex(s[i]) || !is_valid_hex(s[i + 1])) return FALSE; + id->Data4[(i - 20) / 2] = guid_conv_table[s[i]] << 4 | guid_conv_table[s[i + 1]]; + } + + if (s[37] == '}' && s[38] == '\0') + return TRUE; + + return FALSE; +} + +static HRESULT clsid_from_string_reg(LPCOLESTR progid, CLSID *clsid) +{ + WCHAR buf2[CHARS_IN_GUID]; + LONG buf2len = sizeof(buf2); + HKEY xhkey; + WCHAR *buf; + + memset(clsid, 0, sizeof(*clsid)); + buf = heap_alloc((lstrlenW(progid) + 8) * sizeof(WCHAR)); + if (!buf) return E_OUTOFMEMORY; + + lstrcpyW(buf, progid); + lstrcatW(buf, L"\\CLSID"); + if (open_classes_key(HKEY_CLASSES_ROOT, buf, MAXIMUM_ALLOWED, &xhkey)) + { + heap_free(buf); + WARN("couldn't open key for ProgID %s\n", debugstr_w(progid)); + return CO_E_CLASSSTRING; + } + heap_free(buf); + + if (RegQueryValueW(xhkey, NULL, buf2, &buf2len)) + { + RegCloseKey(xhkey); + WARN("couldn't query clsid value for ProgID %s\n", debugstr_w(progid)); + return CO_E_CLASSSTRING; + } + RegCloseKey(xhkey); + return guid_from_string(buf2, clsid) ? S_OK : CO_E_CLASSSTRING; +} + +/****************************************************************************** + * CLSIDFromProgID (combase.@) + */ +HRESULT WINAPI DECLSPEC_HOTPATCH CLSIDFromProgID(LPCOLESTR progid, CLSID *clsid) +{ + ACTCTX_SECTION_KEYED_DATA data; + + if (!progid || !clsid) + return E_INVALIDARG; + + data.cbSize = sizeof(data); + if (FindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_PROGID_REDIRECTION, + progid, &data)) + { + struct progidredirect_data *progiddata = (struct progidredirect_data *)data.lpData; + CLSID *alias = (CLSID *)((BYTE *)data.lpSectionBase + progiddata->clsid_offset); + *clsid = *alias; + return S_OK; + } + + return clsid_from_string_reg(progid, clsid); +} + static void init_multi_qi(DWORD count, MULTI_QI *mqi, HRESULT hr) { ULONG i; diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index a90a418764..4e5c5a9dc9 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -67,7 +67,7 @@ @ stdcall CLIPFORMAT_UserSize(ptr long ptr) @ stdcall CLIPFORMAT_UserUnmarshal(ptr ptr ptr) @ stub CLSIDFromOle1Class -@ stdcall CLSIDFromProgID(wstr ptr) ole32.CLSIDFromProgID +@ stdcall CLSIDFromProgID(wstr ptr) @ stdcall CLSIDFromString(wstr ptr) ole32.CLSIDFromString @ stub CleanupOleStateInAllTls @ stdcall CleanupTlsOleState(ptr) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 47b815b752..91ff812428 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2485,39 +2485,6 @@ HRESULT COM_OpenKeyForAppIdFromCLSID(REFCLSID clsid, REGSAM access, HKEY *subkey return S_OK; } -/****************************************************************************** - * CLSIDFromProgID [OLE32.@] - * - * Converts a program id into the respective GUID. - * - * PARAMS - * progid [I] Unicode program ID, as found in registry. - * clsid [O] Associated CLSID. - * - * RETURNS - * Success: S_OK - * Failure: CO_E_CLASSSTRING - the given ProgID cannot be found. - */ -HRESULT WINAPI DECLSPEC_HOTPATCH CLSIDFromProgID(LPCOLESTR progid, LPCLSID clsid) -{ - ACTCTX_SECTION_KEYED_DATA data; - - if (!progid || !clsid) - return E_INVALIDARG; - - data.cbSize = sizeof(data); - if (FindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_PROGID_REDIRECTION, - progid, &data)) - { - struct progidredirect_data *progiddata = (struct progidredirect_data*)data.lpData; - CLSID *alias = (CLSID*)((BYTE*)data.lpSectionBase + progiddata->clsid_offset); - *clsid = *alias; - return S_OK; - } - - return clsid_from_string_reg(progid, clsid); -} - /****************************************************************************** * CLSIDFromProgIDEx [OLE32.@] */ diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 74eb6f0106..ce5d7987d9 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -3,7 +3,7 @@ @ stdcall CLIPFORMAT_UserMarshal(ptr ptr ptr) combase.CLIPFORMAT_UserMarshal @ stdcall CLIPFORMAT_UserSize(ptr long ptr) combase.CLIPFORMAT_UserSize @ stdcall CLIPFORMAT_UserUnmarshal(ptr ptr ptr) combase.CLIPFORMAT_UserUnmarshal -@ stdcall CLSIDFromProgID(wstr ptr) +@ stdcall CLSIDFromProgID(wstr ptr) combase.CLSIDFromProgID @ stdcall CLSIDFromProgIDEx(wstr ptr) @ stdcall CLSIDFromString(wstr ptr) @ stdcall CoAddRefServerProcess()

1 0

Nikolay Sivov : combase: Move CLSIDFromString().
by Alexandre Julliard Aug. 10, 2020

Aug. 10, 2020

Module: wine Branch: master Commit: b10d99a3713c7c1a579132446b26abeeed63b683 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b10d99a3713c7c1a57913244… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 10 11:12:52 2020 +0300 combase: Move CLSIDFromString(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 22 +++++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 69 ----------------------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 24 insertions(+), 71 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 2d202c796d..2bfd1d79a7 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -1053,6 +1053,28 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CLSIDFromProgID(LPCOLESTR progid, CLSID *clsid) return clsid_from_string_reg(progid, clsid); } +/****************************************************************************** + * CLSIDFromString (combase.@) + */ +HRESULT WINAPI CLSIDFromString(LPCOLESTR str, LPCLSID clsid) +{ + CLSID tmp_id; + HRESULT hr; + + if (!clsid) + return E_INVALIDARG; + + if (guid_from_string(str, clsid)) + return S_OK; + + /* It appears a ProgID is also valid */ + hr = clsid_from_string_reg(str, &tmp_id); + if (SUCCEEDED(hr)) + *clsid = tmp_id; + + return hr; +} + static void init_multi_qi(DWORD count, MULTI_QI *mqi, HRESULT hr) { ULONG i; diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 4e5c5a9dc9..97e8f254dc 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -68,7 +68,7 @@ @ stdcall CLIPFORMAT_UserUnmarshal(ptr ptr ptr) @ stub CLSIDFromOle1Class @ stdcall CLSIDFromProgID(wstr ptr) -@ stdcall CLSIDFromString(wstr ptr) ole32.CLSIDFromString +@ stdcall CLSIDFromString(wstr ptr) @ stub CleanupOleStateInAllTls @ stdcall CleanupTlsOleState(ptr) @ stub ClearCleanupFlag diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 91ff812428..ff0c352c64 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2257,75 +2257,6 @@ static BOOL guid_from_string(LPCWSTR s, GUID *id) return FALSE; } -/*****************************************************************************/ - -static HRESULT clsid_from_string_reg(LPCOLESTR progid, CLSID *clsid) -{ - static const WCHAR clsidW[] = { '\\','C','L','S','I','D',0 }; - WCHAR buf2[CHARS_IN_GUID]; - LONG buf2len = sizeof(buf2); - HKEY xhkey; - WCHAR *buf; - - memset(clsid, 0, sizeof(*clsid)); - buf = HeapAlloc( GetProcessHeap(),0,(lstrlenW(progid)+8) * sizeof(WCHAR) ); - if (!buf) return E_OUTOFMEMORY; - lstrcpyW( buf, progid ); - lstrcatW( buf, clsidW ); - if (open_classes_key(HKEY_CLASSES_ROOT, buf, MAXIMUM_ALLOWED, &xhkey)) - { - HeapFree(GetProcessHeap(),0,buf); - WARN("couldn't open key for ProgID %s\n", debugstr_w(progid)); - return CO_E_CLASSSTRING; - } - HeapFree(GetProcessHeap(),0,buf); - - if (RegQueryValueW(xhkey,NULL,buf2,&buf2len)) - { - RegCloseKey(xhkey); - WARN("couldn't query clsid value for ProgID %s\n", debugstr_w(progid)); - return CO_E_CLASSSTRING; - } - RegCloseKey(xhkey); - return guid_from_string(buf2, clsid) ? S_OK : CO_E_CLASSSTRING; -} - -/****************************************************************************** - * CLSIDFromString [OLE32.@] - * - * Converts a unique identifier from its string representation into - * the GUID struct. - * - * PARAMS - * idstr [I] The string representation of the GUID. - * id [O] GUID converted from the string. - * - * RETURNS - * S_OK on success - * CO_E_CLASSSTRING if idstr is not a valid CLSID - * - * SEE ALSO - * StringFromCLSID - */ -HRESULT WINAPI CLSIDFromString(LPCOLESTR idstr, LPCLSID id ) -{ - HRESULT ret = CO_E_CLASSSTRING; - CLSID tmp_id; - - if (!id) - return E_INVALIDARG; - - if (guid_from_string(idstr, id)) - return S_OK; - - /* It appears a ProgID is also valid */ - ret = clsid_from_string_reg(idstr, &tmp_id); - if(SUCCEEDED(ret)) - *id = tmp_id; - - return ret; -} - /****************************************************************************** * IIDFromString [OLE32.@] * diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index ce5d7987d9..f71fd52032 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -5,7 +5,7 @@ @ stdcall CLIPFORMAT_UserUnmarshal(ptr ptr ptr) combase.CLIPFORMAT_UserUnmarshal @ stdcall CLSIDFromProgID(wstr ptr) combase.CLSIDFromProgID @ stdcall CLSIDFromProgIDEx(wstr ptr) -@ stdcall CLSIDFromString(wstr ptr) +@ stdcall CLSIDFromString(wstr ptr) combase.CLSIDFromString @ stdcall CoAddRefServerProcess() @ stdcall CoAllowSetForegroundWindow(ptr ptr) @ stdcall CoBuildVersion()

1 0

Jacek Caban : include: Introduce wincontypes.h.
by Alexandre Julliard Aug. 10, 2020

Aug. 10, 2020

Module: wine Branch: master Commit: 49449a9e9a01e9748d308cdf0abc6685cc261604 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49449a9e9a01e9748d308cdf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 10 16:05:23 2020 +0200 include: Introduce wincontypes.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/wincon.h | 112 +----------------------------------------- include/wincontypes.h | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 136 insertions(+), 110 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 4b18aa2100..58e407cd7d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -726,6 +726,7 @@ SOURCES = \ wincodec.idl \ wincodecsdk.idl \ wincon.h \ + wincontypes.h \ wincred.h \ wincrypt.h \ windef.h \ diff --git a/include/wincon.h b/include/wincon.h index b044ec7e19..89afdcd516 100644 --- a/include/wincon.h +++ b/include/wincon.h @@ -27,6 +27,8 @@ extern "C" { #include <wingdi.h> #endif +#include <wincontypes.h> + /* AttachConsole special pid value */ #define ATTACH_PARENT_PROCESS ((DWORD) -1) @@ -95,26 +97,6 @@ typedef struct _CONSOLE_CURSOR_INFO { BOOL bVisible; /* Visibility of cursor */ } CONSOLE_CURSOR_INFO, *LPCONSOLE_CURSOR_INFO; -typedef struct tagCOORD -{ - SHORT X; - SHORT Y; -} COORD, *LPCOORD; - -typedef struct tagSMALL_RECT -{ - SHORT Left; - SHORT Top; - SHORT Right; - SHORT Bottom; -} SMALL_RECT,*LPSMALL_RECT; - -typedef struct _CONSOLE_FONT_INFO -{ - DWORD nFont; - COORD dwFontSize; -} CONSOLE_FONT_INFO,*LPCONSOLE_FONT_INFO; - #ifndef NOGDI typedef struct _CONSOLE_FONT_INFOEX { @@ -175,96 +157,6 @@ typedef struct _CONSOLE_SELECTION_INFO SMALL_RECT srSelection; } CONSOLE_SELECTION_INFO,*LPCONSOLE_SELECTION_INFO; -typedef struct tagCHAR_INFO -{ - union - { - WCHAR UnicodeChar; - CHAR AsciiChar; - } Char; - WORD Attributes; -} CHAR_INFO,*LPCHAR_INFO; - -typedef struct tagKEY_EVENT_RECORD -{ - BOOL bKeyDown; /* 04 */ - WORD wRepeatCount; /* 08 */ - WORD wVirtualKeyCode; /* 0A */ - WORD wVirtualScanCode; /* 0C */ - union /* 0E */ - { - WCHAR UnicodeChar; /* 0E */ - CHAR AsciiChar; /* 0E */ - } uChar; - DWORD dwControlKeyState; /* 10 */ -} KEY_EVENT_RECORD,*LPKEY_EVENT_RECORD; - -/* dwControlKeyState bitmask */ -#define RIGHT_ALT_PRESSED 0x0001 -#define LEFT_ALT_PRESSED 0x0002 -#define RIGHT_CTRL_PRESSED 0x0004 -#define LEFT_CTRL_PRESSED 0x0008 -#define SHIFT_PRESSED 0x0010 -#define NUMLOCK_ON 0x0020 -#define SCROLLLOCK_ON 0x0040 -#define CAPSLOCK_ON 0x0080 -#define ENHANCED_KEY 0x0100 - -typedef struct tagMOUSE_EVENT_RECORD -{ - COORD dwMousePosition; - DWORD dwButtonState; - DWORD dwControlKeyState; - DWORD dwEventFlags; -} MOUSE_EVENT_RECORD,*LPMOUSE_EVENT_RECORD; - -/* MOUSE_EVENT_RECORD.dwButtonState */ -#define FROM_LEFT_1ST_BUTTON_PRESSED 0x0001 -#define RIGHTMOST_BUTTON_PRESSED 0x0002 -#define FROM_LEFT_2ND_BUTTON_PRESSED 0x0004 -#define FROM_LEFT_3RD_BUTTON_PRESSED 0x0008 -#define FROM_LEFT_4TH_BUTTON_PRESSED 0x0010 - -/* MOUSE_EVENT_RECORD.dwEventFlags */ -#define MOUSE_MOVED 0x0001 -#define DOUBLE_CLICK 0x0002 -#define MOUSE_WHEELED 0x0004 -#define MOUSE_HWHEELED 0x0008 - -typedef struct tagWINDOW_BUFFER_SIZE_RECORD -{ - COORD dwSize; -} WINDOW_BUFFER_SIZE_RECORD,*LPWINDOW_BUFFER_SIZE_RECORD; - -typedef struct tagMENU_EVENT_RECORD -{ - UINT dwCommandId; /* perhaps UINT16 ??? */ -} MENU_EVENT_RECORD,*LPMENU_EVENT_RECORD; - -typedef struct tagFOCUS_EVENT_RECORD -{ - BOOL bSetFocus; /* perhaps BOOL16 ??? */ -} FOCUS_EVENT_RECORD,*LPFOCUS_EVENT_RECORD; - -typedef struct tagINPUT_RECORD -{ - WORD EventType; /* 00 */ - union - { - KEY_EVENT_RECORD KeyEvent; - MOUSE_EVENT_RECORD MouseEvent; - WINDOW_BUFFER_SIZE_RECORD WindowBufferSizeEvent; - MENU_EVENT_RECORD MenuEvent; - FOCUS_EVENT_RECORD FocusEvent; - } Event; -} INPUT_RECORD,*PINPUT_RECORD; - -/* INPUT_RECORD.wEventType */ -#define KEY_EVENT 0x01 -#define MOUSE_EVENT 0x02 -#define WINDOW_BUFFER_SIZE_EVENT 0x04 -#define MENU_EVENT 0x08 -#define FOCUS_EVENT 0x10 #define CONSOLE_TEXTMODE_BUFFER 1 diff --git a/include/wincontypes.h b/include/wincontypes.h new file mode 100644 index 0000000000..e416c448a3 --- /dev/null +++ b/include/wincontypes.h @@ -0,0 +1,133 @@ +/* + * Copyright (C) the Wine project + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _WINCONTYPES_ +#define _WINCONTYPES_ + +typedef struct tagCOORD +{ + SHORT X; + SHORT Y; +} COORD, *LPCOORD; + +typedef struct tagSMALL_RECT +{ + SHORT Left; + SHORT Top; + SHORT Right; + SHORT Bottom; +} SMALL_RECT,*LPSMALL_RECT; + +typedef struct tagKEY_EVENT_RECORD +{ + BOOL bKeyDown; /* 04 */ + WORD wRepeatCount; /* 08 */ + WORD wVirtualKeyCode; /* 0A */ + WORD wVirtualScanCode; /* 0C */ + union /* 0E */ + { + WCHAR UnicodeChar; /* 0E */ + CHAR AsciiChar; /* 0E */ + } uChar; + DWORD dwControlKeyState; /* 10 */ +} KEY_EVENT_RECORD,*LPKEY_EVENT_RECORD; + +/* dwControlKeyState bitmask */ +#define RIGHT_ALT_PRESSED 0x0001 +#define LEFT_ALT_PRESSED 0x0002 +#define RIGHT_CTRL_PRESSED 0x0004 +#define LEFT_CTRL_PRESSED 0x0008 +#define SHIFT_PRESSED 0x0010 +#define NUMLOCK_ON 0x0020 +#define SCROLLLOCK_ON 0x0040 +#define CAPSLOCK_ON 0x0080 +#define ENHANCED_KEY 0x0100 + +typedef struct tagMOUSE_EVENT_RECORD +{ + COORD dwMousePosition; + DWORD dwButtonState; + DWORD dwControlKeyState; + DWORD dwEventFlags; +} MOUSE_EVENT_RECORD,*LPMOUSE_EVENT_RECORD; + +/* MOUSE_EVENT_RECORD.dwButtonState */ +#define FROM_LEFT_1ST_BUTTON_PRESSED 0x0001 +#define RIGHTMOST_BUTTON_PRESSED 0x0002 +#define FROM_LEFT_2ND_BUTTON_PRESSED 0x0004 +#define FROM_LEFT_3RD_BUTTON_PRESSED 0x0008 +#define FROM_LEFT_4TH_BUTTON_PRESSED 0x0010 + +/* MOUSE_EVENT_RECORD.dwEventFlags */ +#define MOUSE_MOVED 0x0001 +#define DOUBLE_CLICK 0x0002 +#define MOUSE_WHEELED 0x0004 +#define MOUSE_HWHEELED 0x0008 + +typedef struct tagWINDOW_BUFFER_SIZE_RECORD +{ + COORD dwSize; +} WINDOW_BUFFER_SIZE_RECORD,*LPWINDOW_BUFFER_SIZE_RECORD; + +typedef struct tagMENU_EVENT_RECORD +{ + UINT dwCommandId; +} MENU_EVENT_RECORD,*LPMENU_EVENT_RECORD; + +typedef struct tagFOCUS_EVENT_RECORD +{ + BOOL bSetFocus; +} FOCUS_EVENT_RECORD,*LPFOCUS_EVENT_RECORD; + +typedef struct tagINPUT_RECORD +{ + WORD EventType; + union + { + KEY_EVENT_RECORD KeyEvent; + MOUSE_EVENT_RECORD MouseEvent; + WINDOW_BUFFER_SIZE_RECORD WindowBufferSizeEvent; + MENU_EVENT_RECORD MenuEvent; + FOCUS_EVENT_RECORD FocusEvent; + } Event; +} INPUT_RECORD,*PINPUT_RECORD; + +/* INPUT_RECORD.wEventType */ +#define KEY_EVENT 0x01 +#define MOUSE_EVENT 0x02 +#define WINDOW_BUFFER_SIZE_EVENT 0x04 +#define MENU_EVENT 0x08 +#define FOCUS_EVENT 0x10 + +typedef struct tagCHAR_INFO +{ + union + { + WCHAR UnicodeChar; + CHAR AsciiChar; + } Char; + WORD Attributes; +} CHAR_INFO,*LPCHAR_INFO; + +typedef struct _CONSOLE_FONT_INFO +{ + DWORD nFont; + COORD dwFontSize; +} CONSOLE_FONT_INFO,*LPCONSOLE_FONT_INFO; + +#endif /* _WINCONTYPES_ */

1 0