September 2021 - Wine-commits

Jacek Caban : gdi32: Move load_script_name call to EnumFontFamiliesExW.
by Alexandre Julliard 20 Sep '21

20 Sep '21

Module: wine Branch: master Commit: c5d71400546706f9fa38275a629ec1a8c8fc9b07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5d71400546706f9fa38275a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 20 13:13:47 2021 +0200 gdi32: Move load_script_name call to EnumFontFamiliesExW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 32 ++++---------------------------- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/text.c | 25 +++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 28 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 839244545cb..95a6bad3b92 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -32,7 +32,6 @@ #include "winternl.h" #include "winreg.h" #include "ntgdi_private.h" -#include "resource.h" #include "wine/exception.h" #include "wine/heap.h" #include "wine/rbtree.h" @@ -2589,29 +2588,6 @@ struct enum_charset DWORD script; }; -static int load_script_name( UINT id, WCHAR buffer[LF_FACESIZE] ) -{ - HRSRC rsrc; - HGLOBAL hMem; - WCHAR *p; - int i; - - id += IDS_FIRST_SCRIPT; - rsrc = FindResourceW( gdi32_module, (LPCWSTR)(ULONG_PTR)((id >> 4) + 1), (LPCWSTR)6 /*RT_STRING*/ ); - if (!rsrc) return 0; - hMem = LoadResource( gdi32_module, rsrc ); - if (!hMem) return 0; - - p = LockResource( hMem ); - id &= 0x000f; - while (id--) p += *p + 1; - - i = min(LF_FACESIZE - 1, *p); - memcpy(buffer, p + 1, i * sizeof(WCHAR)); - buffer[i] = 0; - return i; -} - static BOOL is_complex_script_ansi_cp( UINT ansi_cp ) { return (ansi_cp == 874 /* Thai */ @@ -2678,7 +2654,7 @@ static DWORD create_enum_charset_list(DWORD charset, struct enum_charset *list) { list->mask = ~mask; list->charset = DEFAULT_CHARSET; - list->script = IDS_OTHER - IDS_FIRST_SCRIPT; + list->script = 33; /* other */ list++; } } @@ -2834,7 +2810,7 @@ static BOOL enum_face_charsets( const struct gdi_font_family *family, struct gdi if (face->fs.fsCsb[0] == 0) /* OEM */ { elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = OEM_CHARSET; - load_script_name( IDS_OEM_DOS - IDS_FIRST_SCRIPT, elf.elfScript ); + elf.elfScript[0] = 32; i = count; /* break out of loop after enumeration */ } else @@ -2843,8 +2819,8 @@ static BOOL enum_face_charsets( const struct gdi_font_family *family, struct gdi /* use the DEFAULT_CHARSET case only if no other charset is present */ if (list[i].charset == DEFAULT_CHARSET && (face->fs.fsCsb[0] & ~list[i].mask)) continue; elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = list[i].charset; - load_script_name( list[i].script, elf.elfScript ); - if (!elf.elfScript[0]) FIXME("Unknown elfscript for id %u\n", list[i].script); + /* caller may fill elfScript with the actual string, see load_script_name */ + elf.elfScript[0] = list[i].script; } TRACE( "face %s full %s style %s charset = %d type %d script %s it %d weight %d ntmflags %08x\n", debugstr_w(elf.elfLogFont.lfFaceName), debugstr_w(elf.elfFullName), debugstr_w(elf.elfStyle), diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 238ae3b7de1..cf09cf85ad4 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -299,4 +299,6 @@ static inline int get_dib_info_size( const BITMAPINFO *info, UINT coloruse ) return FIELD_OFFSET( BITMAPINFO, bmiColors[info->bmiHeader.biClrUsed] ); } +extern HMODULE gdi32_module DECLSPEC_HIDDEN; + #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 4037eaa4b65..641c15aab70 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -54,6 +54,7 @@ #include "usp10.h" #include "wine/debug.h" #include "gdi_private.h" +#include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(bidi); @@ -2037,6 +2038,29 @@ BOOL WINAPI GdiRealizationInfo( HDC hdc, struct realization_info *info ) return TRUE; } +static void load_script_name( UINT id, WCHAR buffer[LF_FACESIZE] ) +{ + HRSRC rsrc; + HGLOBAL hMem; + WCHAR *p; + int i; + + id += IDS_FIRST_SCRIPT; + buffer[0] = 0; + rsrc = FindResourceW( gdi32_module, (LPCWSTR)(ULONG_PTR)((id >> 4) + 1), (LPCWSTR)6 /*RT_STRING*/ ); + if (!rsrc) return; + hMem = LoadResource( gdi32_module, rsrc ); + if (!hMem) return; + + p = LockResource( hMem ); + id &= 0x000f; + while (id--) p += *p + 1; + + i = min( LF_FACESIZE - 1, *p ); + memcpy( buffer, p + 1, i * sizeof(WCHAR) ); + buffer[i] = 0; +} + /*********************************************************************** * EnumFontFamiliesExW (GDI32.@) */ @@ -2072,6 +2096,7 @@ INT WINAPI EnumFontFamiliesExW( HDC hdc, LOGFONTW *lf, FONTENUMPROCW efproc, count /= sizeof(*entries); for (i = 0; ret && i < count; i++) { + load_script_name( entries[i].lf.elfScript[0], entries[i].lf.elfScript ); ret = efproc( (const LOGFONTW *)&entries[i].lf, (const TEXTMETRICW *)&entries[i].tm, entries[i].type, lparam ); }

1 0

Jacek Caban : gdi32: Move CreateScalableFontResourceW to text.c.
by Alexandre Julliard 20 Sep '21

20 Sep '21

Module: wine Branch: master Commit: 0d35d2aa19d562dea8b62405fba01a37d0daf7a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d35d2aa19d562dea8b62405… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 20 13:14:14 2021 +0200 gdi32: Move CreateScalableFontResourceW to text.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 248 +--------------------------------------------- dlls/gdi32/gdi_private.h | 2 + dlls/gdi32/text.c | 251 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 257 insertions(+), 244 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0d35d2aa19d562dea8b6…

1 0

Jacek Caban : gdi32: Handle scalable fonts directly in AddFontResourceExW and RemoveFontResourceExW.
by Alexandre Julliard 20 Sep '21

20 Sep '21

Module: wine Branch: master Commit: c332707df4b90803ff2e814f7f6d7bc2464300ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=c332707df4b90803ff2e814f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 20 13:14:47 2021 +0200 gdi32: Handle scalable fonts directly in AddFontResourceExW and RemoveFontResourceExW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 101 -------------------------------------------------- dlls/gdi32/text.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 107 insertions(+), 103 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 224dc6b3a77..07b4d248261 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5560,91 +5560,6 @@ static BOOL CALLBACK load_enumed_resource(HMODULE hModule, LPCWSTR type, LPWSTR return TRUE; } -static void *map_file( const WCHAR *filename, LARGE_INTEGER *size ) -{ - HANDLE file, mapping; - void *ptr; - - file = CreateFileW( filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); - if (file == INVALID_HANDLE_VALUE) return NULL; - - if (!GetFileSizeEx( file, size ) || size->u.HighPart) - { - CloseHandle( file ); - return NULL; - } - - mapping = CreateFileMappingW( file, NULL, PAGE_READONLY, 0, 0, NULL ); - CloseHandle( file ); - if (!mapping) return NULL; - - ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 ); - CloseHandle( mapping ); - - return ptr; -} - -static void *find_resource( BYTE *ptr, WORD type, DWORD rsrc_off, DWORD size, DWORD *len ) -{ - WORD align, type_id, count; - DWORD res_off; - - if (size < rsrc_off + 10) return NULL; - align = *(WORD *)(ptr + rsrc_off); - rsrc_off += 2; - type_id = *(WORD *)(ptr + rsrc_off); - while (type_id && type_id != type) - { - count = *(WORD *)(ptr + rsrc_off + 2); - rsrc_off += 8 + count * 12; - if (size < rsrc_off + 8) return NULL; - type_id = *(WORD *)(ptr + rsrc_off); - } - if (!type_id) return NULL; - count = *(WORD *)(ptr + rsrc_off + 2); - if (size < rsrc_off + 8 + count * 12) return NULL; - res_off = *(WORD *)(ptr + rsrc_off + 8) << align; - *len = *(WORD *)(ptr + rsrc_off + 10) << align; - if (size < res_off + *len) return NULL; - return ptr + res_off; -} - -static WCHAR *get_scalable_filename( const WCHAR *res, BOOL *hidden ) -{ - LARGE_INTEGER size; - BYTE *ptr = map_file( res, &size ); - const IMAGE_DOS_HEADER *dos; - const IMAGE_OS2_HEADER *ne; - WORD *fontdir; - char *data; - WCHAR *name = NULL; - DWORD len; - - if (!ptr) return NULL; - - if (size.u.LowPart < sizeof( *dos )) goto fail; - dos = (const IMAGE_DOS_HEADER *)ptr; - if (dos->e_magic != IMAGE_DOS_SIGNATURE) goto fail; - if (size.u.LowPart < dos->e_lfanew + sizeof( *ne )) goto fail; - ne = (const IMAGE_OS2_HEADER *)(ptr + dos->e_lfanew); - - fontdir = find_resource( ptr, 0x8007, dos->e_lfanew + ne->ne_rsrctab, size.u.LowPart, &len ); - if (!fontdir) goto fail; - *hidden = (fontdir[35] & 0x80) != 0; /* fontdir->dfType */ - - data = find_resource( ptr, 0x80cc, dos->e_lfanew + ne->ne_rsrctab, size.u.LowPart, &len ); - if (!data) goto fail; - if (!memchr( data, 0, len )) goto fail; - - len = MultiByteToWideChar( CP_ACP, 0, data, -1, NULL, 0 ); - name = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - if (name) MultiByteToWideChar( CP_ACP, 0, data, -1, name, len ); - -fail: - UnmapViewOfFile( ptr ); - return name; -} - static int add_system_font_resource( const WCHAR *file, DWORD flags ) { WCHAR path[MAX_PATH]; @@ -5967,8 +5882,6 @@ INT WINAPI NtGdiAddFontResourceW( const WCHAR *str, ULONG size, ULONG files, DWO DWORD tid, void *dv ) { int ret; - WCHAR *filename; - BOOL hidden; if (!font_funcs) return 1; if (!(ret = add_font_resource( str, flags ))) @@ -5986,12 +5899,6 @@ INT WINAPI NtGdiAddFontResourceW( const WCHAR *str, ULONG size, ULONG files, DWO ret = num_resources; FreeLibrary(hModule); } - else if ((filename = get_scalable_filename( str, &hidden )) != NULL) - { - if (hidden) flags |= FR_PRIVATE | FR_NOT_ENUM; - ret = add_font_resource( filename, flags ); - HeapFree( GetProcessHeap(), 0, filename ); - } } return ret; } @@ -6061,8 +5968,6 @@ BOOL WINAPI NtGdiRemoveFontResourceW( const WCHAR *str, ULONG size, ULONG files, DWORD tid, void *dv ) { int ret; - WCHAR *filename; - BOOL hidden; if (!font_funcs) return TRUE; @@ -6075,12 +5980,6 @@ BOOL WINAPI NtGdiRemoveFontResourceW( const WCHAR *str, ULONG size, ULONG files, WARN("Can't unload resources from PE file %s\n", wine_dbgstr_w(str)); FreeLibrary(hModule); } - else if ((filename = get_scalable_filename( str, &hidden )) != NULL) - { - if (hidden) flags |= FR_PRIVATE | FR_NOT_ENUM; - ret = remove_font_resource( filename, flags ); - HeapFree( GetProcessHeap(), 0, filename ); - } } return ret; } diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index b7c6706ef22..41333903c0c 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -2300,12 +2300,107 @@ BOOL WINAPI RemoveFontResourceExA( const char *str, DWORD fl, void *pdv ) return ret; } +static void *map_file( const WCHAR *filename, LARGE_INTEGER *size ) +{ + HANDLE file, mapping; + void *ptr; + + file = CreateFileW( filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); + if (file == INVALID_HANDLE_VALUE) return NULL; + + if (!GetFileSizeEx( file, size ) || size->u.HighPart) + { + CloseHandle( file ); + return NULL; + } + + mapping = CreateFileMappingW( file, NULL, PAGE_READONLY, 0, 0, NULL ); + CloseHandle( file ); + if (!mapping) return NULL; + + ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 ); + CloseHandle( mapping ); + + return ptr; +} + +static void *find_resource( BYTE *ptr, WORD type, DWORD rsrc_off, DWORD size, DWORD *len ) +{ + WORD align, type_id, count; + DWORD res_off; + + if (size < rsrc_off + 10) return NULL; + align = *(WORD *)(ptr + rsrc_off); + rsrc_off += 2; + type_id = *(WORD *)(ptr + rsrc_off); + while (type_id && type_id != type) + { + count = *(WORD *)(ptr + rsrc_off + 2); + rsrc_off += 8 + count * 12; + if (size < rsrc_off + 8) return NULL; + type_id = *(WORD *)(ptr + rsrc_off); + } + if (!type_id) return NULL; + count = *(WORD *)(ptr + rsrc_off + 2); + if (size < rsrc_off + 8 + count * 12) return NULL; + res_off = *(WORD *)(ptr + rsrc_off + 8) << align; + *len = *(WORD *)(ptr + rsrc_off + 10) << align; + if (size < res_off + *len) return NULL; + return ptr + res_off; +} + +static WCHAR *get_scalable_filename( const WCHAR *res, BOOL *hidden ) +{ + LARGE_INTEGER size; + BYTE *ptr = map_file( res, &size ); + const IMAGE_DOS_HEADER *dos; + const IMAGE_OS2_HEADER *ne; + WORD *fontdir; + char *data; + WCHAR *name = NULL; + DWORD len; + + if (!ptr) return NULL; + + if (size.u.LowPart < sizeof( *dos )) goto fail; + dos = (const IMAGE_DOS_HEADER *)ptr; + if (dos->e_magic != IMAGE_DOS_SIGNATURE) goto fail; + if (size.u.LowPart < dos->e_lfanew + sizeof( *ne )) goto fail; + ne = (const IMAGE_OS2_HEADER *)(ptr + dos->e_lfanew); + + fontdir = find_resource( ptr, 0x8007, dos->e_lfanew + ne->ne_rsrctab, size.u.LowPart, &len ); + if (!fontdir) goto fail; + *hidden = (fontdir[35] & 0x80) != 0; /* fontdir->dfType */ + + data = find_resource( ptr, 0x80cc, dos->e_lfanew + ne->ne_rsrctab, size.u.LowPart, &len ); + if (!data) goto fail; + if (!memchr( data, 0, len )) goto fail; + + len = MultiByteToWideChar( CP_ACP, 0, data, -1, NULL, 0 ); + name = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + if (name) MultiByteToWideChar( CP_ACP, 0, data, -1, name, len ); + +fail: + UnmapViewOfFile( ptr ); + return name; +} + /*********************************************************************** * AddFontResourceExW (GDI32.@) */ INT WINAPI AddFontResourceExW( const WCHAR *str, DWORD flags, void *dv ) { - return NtGdiAddFontResourceW( str, 0, 1, flags, 0, dv ); + WCHAR *filename = NULL; + BOOL hidden; + INT ret; + + if ((ret = NtGdiAddFontResourceW( str, 0, 1, flags, 0, dv ))) return ret; + + if (!(filename = get_scalable_filename( str, &hidden ))) return 0; + if (hidden) flags |= FR_PRIVATE | FR_NOT_ENUM; + ret = NtGdiAddFontResourceW( filename, 0, 1, flags, 0, dv ); + HeapFree( GetProcessHeap(), 0, filename ); + return ret; } /*********************************************************************** @@ -2313,7 +2408,17 @@ INT WINAPI AddFontResourceExW( const WCHAR *str, DWORD flags, void *dv ) */ BOOL WINAPI RemoveFontResourceExW( const WCHAR *str, DWORD flags, void *dv ) { - return NtGdiRemoveFontResourceW( str, 0, 1, flags, 0, dv ); + WCHAR *filename = NULL; + BOOL hidden; + INT ret; + + if ((ret = NtGdiRemoveFontResourceW( str, 0, 1, flags, 0, dv ))) return ret; + + if (!(filename = get_scalable_filename( str, &hidden ))) return 0; + if (hidden) flags |= FR_PRIVATE | FR_NOT_ENUM; + ret = NtGdiRemoveFontResourceW( filename, 0, 1, flags, 0, dv ); + HeapFree( GetProcessHeap(), 0, filename ); + return ret; } /***********************************************************************

1 0

Connor McAdams : oleacc: Add Client_get_accFocus implementation.
by Alexandre Julliard 20 Sep '21

20 Sep '21

Module: wine Branch: master Commit: 57895ed8aeb3f32989e6f80de25ef158a2a3d6d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57895ed8aeb3f32989e6f80d… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Sep 20 18:03:25 2021 +0200 oleacc: Add Client_get_accFocus implementation. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/client.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 0c2215fe62e..93f6b590f78 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -303,11 +303,37 @@ static HRESULT WINAPI Client_get_accKeyboardShortcut(IAccessible *iface, return S_OK; } -static HRESULT WINAPI Client_get_accFocus(IAccessible *iface, VARIANT *pvarID) +static HRESULT WINAPI Client_get_accFocus(IAccessible *iface, VARIANT *focus) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%p)\n", This, pvarID); - return E_NOTIMPL; + GUITHREADINFO info; + + TRACE("(%p)->(%p)\n", This, focus); + + V_VT(focus) = VT_EMPTY; + info.cbSize = sizeof(info); + if(GetGUIThreadInfo(0, &info) && info.hwndFocus) { + if(info.hwndFocus == This->hwnd) { + V_VT(focus) = VT_I4; + V_I4(focus) = CHILDID_SELF; + } + else if(IsChild(This->hwnd, info.hwndFocus)) { + IDispatch *disp; + HRESULT hr; + + hr = AccessibleObjectFromWindow(info.hwndFocus, OBJID_WINDOW, + &IID_IDispatch, (void**)&disp); + if(FAILED(hr)) + return hr; + if(!disp) + return E_FAIL; + + V_VT(focus) = VT_DISPATCH; + V_DISPATCH(focus) = disp; + } + } + + return S_OK; } static HRESULT WINAPI Client_get_accSelection(IAccessible *iface, VARIANT *pvarID)

1 0

Connor McAdams : oleacc: Add Client_get_accFocus tests.
by Alexandre Julliard 20 Sep '21

20 Sep '21

Module: wine Branch: master Commit: 1a3db363c6b4065af532a8db1e6309be753b1781 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a3db363c6b4065af532a8db… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Sep 20 18:03:31 2021 +0200 oleacc: Add Client_get_accFocus tests. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 97 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 97fc625ac8b..180113b29f9 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -916,11 +916,11 @@ static DWORD WINAPI default_client_thread(LPVOID param) static void test_default_client_accessible_object(void) { - IAccessible *acc; + IAccessible *acc, *win; IDispatch *disp; IOleWindow *ow; IEnumVARIANT *ev; - HWND chld, btn, hwnd, hwnd2; + HWND chld, chld2, btn, hwnd, hwnd2; HRESULT hr; VARIANT vid, v; BSTR str; @@ -939,6 +939,9 @@ static void test_default_client_accessible_object(void) btn = CreateWindowA("BUTTON", "btn &t &junk", WS_TABSTOP | WS_VISIBLE | WS_CHILD | BS_DEFPUSHBUTTON, 50, 0, 50, 50, hwnd, NULL, NULL, NULL); ok(btn != NULL, "CreateWindow failed\n"); + chld2 = CreateWindowA("static", "static &t &junk", WS_CHILD | WS_VISIBLE, + 0, 0, 50, 50, chld, NULL, NULL, NULL); + ok(chld2 != NULL, "CreateWindow failed\n"); hr = CreateStdAccessibleObject(NULL, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); ok(hr == E_FAIL, "got %x\n", hr); @@ -1013,6 +1016,94 @@ static void test_default_client_accessible_object(void) ok(hr == E_INVALIDARG, "get_accChild returned %x\n", hr); ok(disp == NULL, "disp = %p\n", disp); + /* Neither the parent nor any child windows have focus, VT_EMPTY. */ + hr = IAccessible_get_accFocus(acc, &v); + ok(hr == S_OK, "hr %#x\n", hr); + ok(V_VT(&v) == VT_EMPTY, "V_VT(&v) = %d\n", V_VT(&v)); + + /* Set the focus to the parent window. */ + ShowWindow(hwnd, SW_SHOW); + SetFocus(hwnd); + hr = IAccessible_get_accFocus(acc, &v); + ok(hr == S_OK, "hr %#x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == CHILDID_SELF, "V_I4(&v) = %d\n", V_I4(&v)); + + /* Set focus to each child window. */ + SetFocus(btn); + hr = IAccessible_get_accFocus(acc, &v); + ok(hr == S_OK, "hr %#x\n", hr); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(&v) = %p\n", V_DISPATCH(&v)); + + hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IOleWindow, (void**)&ow); + ok(hr == S_OK, "got %x\n", hr); + hr = IOleWindow_GetWindow(ow, &hwnd2); + todo_wine ok(hr == S_OK, "got %x\n", hr); + todo_wine ok(btn == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, btn); + IOleWindow_Release(ow); + + hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IAccessible, (void**)&win); + ok(hr == S_OK, "got %x\n", hr); + IDispatch_Release(V_DISPATCH(&v)); + + V_VT(&vid) = VT_I4; + V_I4(&vid) = CHILDID_SELF; + hr = IAccessible_get_accRole(win, vid, &v); + todo_wine ok(hr == S_OK, "got %x\n", hr); + todo_wine ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + todo_wine ok(V_I4(&v) == ROLE_SYSTEM_WINDOW, "V_I4(&v) = %d\n", V_I4(&v)); + IAccessible_Release(win); + + SetFocus(chld); + hr = IAccessible_get_accFocus(acc, &v); + ok(hr == S_OK, "hr %#x\n", hr); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(&v) = %p\n", V_DISPATCH(&v)); + + hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IOleWindow, (void**)&ow); + ok(hr == S_OK, "got %x\n", hr); + hr = IOleWindow_GetWindow(ow, &hwnd2); + todo_wine ok(hr == S_OK, "got %x\n", hr); + todo_wine ok(chld == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, chld); + IOleWindow_Release(ow); + + hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IAccessible, (void**)&win); + ok(hr == S_OK, "got %x\n", hr); + IDispatch_Release(V_DISPATCH(&v)); + + hr = IAccessible_get_accRole(win, vid, &v); + todo_wine ok(hr == S_OK, "got %x\n", hr); + todo_wine ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + todo_wine ok(V_I4(&v) == ROLE_SYSTEM_WINDOW, "V_I4(&v) = %d\n", V_I4(&v)); + IAccessible_Release(win); + + /* Child of a child, still works on parent HWND. */ + SetFocus(chld2); + hr = IAccessible_get_accFocus(acc, &v); + ok(hr == S_OK, "hr %#x\n", hr); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(&v) = %p\n", V_DISPATCH(&v)); + + hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IOleWindow, (void**)&ow); + ok(hr == S_OK, "got %x\n", hr); + hr = IOleWindow_GetWindow(ow, &hwnd2); + todo_wine ok(hr == S_OK, "got %x\n", hr); + todo_wine ok(chld2 == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, chld2); + IOleWindow_Release(ow); + + hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IAccessible, (void**)&win); + ok(hr == S_OK, "got %x\n", hr); + IDispatch_Release(V_DISPATCH(&v)); + + hr = IAccessible_get_accRole(win, vid, &v); + todo_wine ok(hr == S_OK, "got %x\n", hr); + todo_wine ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + todo_wine ok(V_I4(&v) == ROLE_SYSTEM_WINDOW, "V_I4(&v) = %d\n", V_I4(&v)); + IAccessible_Release(win); + + ShowWindow(hwnd, SW_HIDE); + hr = IAccessible_QueryInterface(acc, &IID_IEnumVARIANT, (void**)&ev); ok(hr == S_OK, "got %x\n", hr); @@ -1195,6 +1286,10 @@ static void test_default_client_accessible_object(void) ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); ok(V_I4(&v) == STATE_SYSTEM_INVISIBLE, "V_I4(&v) = %x\n", V_I4(&v)); + hr = IAccessible_get_accFocus(acc, &v); + ok(hr == S_OK, "hr %#x\n", hr); + ok(V_VT(&v) == VT_EMPTY, "V_VT(&v) = %d\n", V_VT(&v)); + hr = IAccessible_accHitTest(acc, 200, 200, &v); ok(hr == S_OK, "got %x\n", hr); ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v));

1 0

Piotr Caban : oleacc: Add Window_OleWindow_GetWindow implementation.
by Alexandre Julliard 20 Sep '21

20 Sep '21

Module: wine Branch: master Commit: 3e3a2be891fb583f2f1e298033c2a3da31af659e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e3a2be891fb583f2f1e2980… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 20 18:03:36 2021 +0200 oleacc: Add Window_OleWindow_GetWindow implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 12 ++++++------ dlls/oleacc/window.c | 12 +++++++++--- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 180113b29f9..7d1c376bc25 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -1039,8 +1039,8 @@ static void test_default_client_accessible_object(void) hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IOleWindow, (void**)&ow); ok(hr == S_OK, "got %x\n", hr); hr = IOleWindow_GetWindow(ow, &hwnd2); - todo_wine ok(hr == S_OK, "got %x\n", hr); - todo_wine ok(btn == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, btn); + ok(hr == S_OK, "got %x\n", hr); + ok(btn == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, btn); IOleWindow_Release(ow); hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IAccessible, (void**)&win); @@ -1064,8 +1064,8 @@ static void test_default_client_accessible_object(void) hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IOleWindow, (void**)&ow); ok(hr == S_OK, "got %x\n", hr); hr = IOleWindow_GetWindow(ow, &hwnd2); - todo_wine ok(hr == S_OK, "got %x\n", hr); - todo_wine ok(chld == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, chld); + ok(hr == S_OK, "got %x\n", hr); + ok(chld == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, chld); IOleWindow_Release(ow); hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IAccessible, (void**)&win); @@ -1088,8 +1088,8 @@ static void test_default_client_accessible_object(void) hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IOleWindow, (void**)&ow); ok(hr == S_OK, "got %x\n", hr); hr = IOleWindow_GetWindow(ow, &hwnd2); - todo_wine ok(hr == S_OK, "got %x\n", hr); - todo_wine ok(chld2 == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, chld2); + ok(hr == S_OK, "got %x\n", hr); + ok(chld2 == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, chld2); IOleWindow_Release(ow); hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IAccessible, (void**)&win); diff --git a/dlls/oleacc/window.c b/dlls/oleacc/window.c index 5957d49ef1f..387ed4bc9f7 100644 --- a/dlls/oleacc/window.c +++ b/dlls/oleacc/window.c @@ -31,6 +31,8 @@ typedef struct { IEnumVARIANT IEnumVARIANT_iface; LONG ref; + + HWND hwnd; } Window; static inline Window* impl_from_Window(IAccessible *iface) @@ -327,11 +329,14 @@ static ULONG WINAPI Window_OleWindow_Release(IOleWindow *iface) return IAccessible_Release(&This->IAccessible_iface); } -static HRESULT WINAPI Window_OleWindow_GetWindow(IOleWindow *iface, HWND *phwnd) +static HRESULT WINAPI Window_OleWindow_GetWindow(IOleWindow *iface, HWND *hwnd) { Window *This = impl_from_Window_OleWindow(iface); - FIXME("(%p)->(%p)\n", This, phwnd); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, hwnd); + + *hwnd = This->hwnd; + return S_OK; } static HRESULT WINAPI Window_OleWindow_ContextSensitiveHelp(IOleWindow *iface, BOOL fEnterMode) @@ -427,6 +432,7 @@ HRESULT create_window_object(HWND hwnd, const IID *iid, void **obj) window->IOleWindow_iface.lpVtbl = &WindowOleWindowVtbl; window->IEnumVARIANT_iface.lpVtbl = &WindowEnumVARIANTVtbl; window->ref = 1; + window->hwnd = hwnd; hres = IAccessible_QueryInterface(&window->IAccessible_iface, iid, obj); IAccessible_Release(&window->IAccessible_iface);

1 0

Piotr Caban : oleacc: Introduce helper for checking accessibility object hwnd.
by Alexandre Julliard 20 Sep '21

20 Sep '21

Module: wine Branch: master Commit: 82b8b361d2794f0fdaae07bb715a2e0167bd703c URL: https://source.winehq.org/git/wine.git/?a=commit;h=82b8b361d2794f0fdaae07bb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 20 18:03:40 2021 +0200 oleacc: Introduce helper for checking accessibility object hwnd. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 47 +++++++++++++++++++---------------------------- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 7d1c376bc25..98da7eb3ddc 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -896,6 +896,21 @@ static void _check_acc_state(unsigned line, IAccessible *acc, INT state) ok_(__FILE__, line)(V_I4(&v) == state, "V_I4(&v) = %x\n", V_I4(&v)); } +#define check_acc_hwnd(unk, hwnd) _check_acc_hwnd(__LINE__, unk, hwnd) +static void _check_acc_hwnd(unsigned line, IUnknown *unk, HWND exp) +{ + IOleWindow *ow; + HRESULT hr; + HWND hwnd; + + hr = IUnknown_QueryInterface(unk, &IID_IOleWindow, (void**)&ow); + ok_(__FILE__, line)(hr == S_OK, "got %x\n", hr); + hr = IOleWindow_GetWindow(ow, &hwnd); + ok_(__FILE__, line)(hr == S_OK, "got %x\n", hr); + ok_(__FILE__, line)(hwnd == exp, "hwnd = %p, expected %p\n", hwnd, exp); + IOleWindow_Release(ow); +} + static DWORD WINAPI default_client_thread(LPVOID param) { IAccessible *acc = param; @@ -918,7 +933,6 @@ static void test_default_client_accessible_object(void) { IAccessible *acc, *win; IDispatch *disp; - IOleWindow *ow; IEnumVARIANT *ev; HWND chld, chld2, btn, hwnd, hwnd2; HRESULT hr; @@ -989,15 +1003,10 @@ static void test_default_client_accessible_object(void) hr = CreateStdAccessibleObject(hwnd, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); ok(hr == S_OK, "got %x\n", hr); - hr = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow); - ok(hr == S_OK, "got %x\n", hr); - hr = IOleWindow_GetWindow(ow, &hwnd2); - ok(hr == S_OK, "got %x\n", hr); - ok(hwnd == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, hwnd); + check_acc_hwnd((IUnknown*)acc, hwnd); hr = WindowFromAccessibleObject(acc, &hwnd2); ok(hr == S_OK, "got %x\n", hr); ok(hwnd == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, hwnd); - IOleWindow_Release(ow); hr = IAccessible_get_accChildCount(acc, &l); ok(hr == S_OK, "got %x\n", hr); @@ -1035,13 +1044,7 @@ static void test_default_client_accessible_object(void) ok(hr == S_OK, "hr %#x\n", hr); ok(V_VT(&v) == VT_DISPATCH, "V_VT(&v) = %d\n", V_VT(&v)); ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(&v) = %p\n", V_DISPATCH(&v)); - - hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IOleWindow, (void**)&ow); - ok(hr == S_OK, "got %x\n", hr); - hr = IOleWindow_GetWindow(ow, &hwnd2); - ok(hr == S_OK, "got %x\n", hr); - ok(btn == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, btn); - IOleWindow_Release(ow); + check_acc_hwnd((IUnknown*)V_DISPATCH(&v), btn); hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IAccessible, (void**)&win); ok(hr == S_OK, "got %x\n", hr); @@ -1060,13 +1063,7 @@ static void test_default_client_accessible_object(void) ok(hr == S_OK, "hr %#x\n", hr); ok(V_VT(&v) == VT_DISPATCH, "V_VT(&v) = %d\n", V_VT(&v)); ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(&v) = %p\n", V_DISPATCH(&v)); - - hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IOleWindow, (void**)&ow); - ok(hr == S_OK, "got %x\n", hr); - hr = IOleWindow_GetWindow(ow, &hwnd2); - ok(hr == S_OK, "got %x\n", hr); - ok(chld == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, chld); - IOleWindow_Release(ow); + check_acc_hwnd((IUnknown*)V_DISPATCH(&v), chld); hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IAccessible, (void**)&win); ok(hr == S_OK, "got %x\n", hr); @@ -1084,13 +1081,7 @@ static void test_default_client_accessible_object(void) ok(hr == S_OK, "hr %#x\n", hr); ok(V_VT(&v) == VT_DISPATCH, "V_VT(&v) = %d\n", V_VT(&v)); ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(&v) = %p\n", V_DISPATCH(&v)); - - hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IOleWindow, (void**)&ow); - ok(hr == S_OK, "got %x\n", hr); - hr = IOleWindow_GetWindow(ow, &hwnd2); - ok(hr == S_OK, "got %x\n", hr); - ok(chld2 == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, chld2); - IOleWindow_Release(ow); + check_acc_hwnd((IUnknown*)V_DISPATCH(&v), chld2); hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IAccessible, (void**)&win); ok(hr == S_OK, "got %x\n", hr);

1 0

Piotr Caban : oleacc: Remove WINAPI from accessible_create internal type.
by Alexandre Julliard 20 Sep '21

20 Sep '21

Module: wine Branch: master Commit: aa63f9c9405fc089e5c82559f0513e8a79f2fbf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa63f9c9405fc089e5c82559… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 20 18:03:46 2021 +0200 oleacc: Remove WINAPI from accessible_create internal type. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index beceb2ff1fb..db9f646988c 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); static const WCHAR lresult_atom_prefix[] = {'w','i','n','e','_','o','l','e','a','c','c',':'}; -typedef HRESULT (WINAPI *accessible_create)(HWND, const IID*, void**); +typedef HRESULT (*accessible_create)(HWND, const IID*, void**); extern HRESULT WINAPI OLEACC_DllGetClassObject(REFCLSID, REFIID, void**) DECLSPEC_HIDDEN; extern BOOL WINAPI OLEACC_DllMain(HINSTANCE, DWORD, void*) DECLSPEC_HIDDEN;

1 0

Rémi Bernon : hidparse.sys: Split struct hid_value_caps start_bit into start_byte / start_bit.
by Alexandre Julliard 20 Sep '21

20 Sep '21

Module: wine Branch: master Commit: 6fa0d12724be45407f0a5ccdb9db8bd4b53db6c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fa0d12724be45407f0a5ccd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 17 09:18:54 2021 +0200 hidparse.sys: Split struct hid_value_caps start_bit into start_byte / start_bit. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 63 +++++++++++++++++++++++++++++++++++------------- dlls/hidparse.sys/main.c | 16 ++++++------ include/wine/hid.h | 3 ++- 3 files changed, 57 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6fa0d12724be45407f0a…

1 0

Nikolay Sivov : d3d10/effect: Move effect creation API functions.
by Alexandre Julliard 20 Sep '21

20 Sep '21

Module: wine Branch: master Commit: d6359f0bba9e7cc74472c11061fd3db10a47c220 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6359f0bba9e7cc74472c110… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 16 09:48:08 2021 +0300 d3d10/effect: Move effect creation API functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_main.c | 53 ------------------------------------------------- dlls/d3d10/effect.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 2d08c82a3c4..6961589ca31 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -230,50 +230,6 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER return S_OK; } -static int d3d10_effect_type_compare(const void *key, const struct wine_rb_entry *entry) -{ - const struct d3d10_effect_type *t = WINE_RB_ENTRY_VALUE(entry, const struct d3d10_effect_type, entry); - const DWORD *id = key; - - return *id - t->id; -} - -HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT flags, - ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3D10Effect **effect) -{ - struct d3d10_effect *object; - HRESULT hr; - - FIXME("data %p, data_size %lu, flags %#x, device %p, effect_pool %p, effect %p stub!\n", - data, data_size, flags, device, effect_pool, effect); - - if (!(object = heap_alloc_zero(sizeof(*object)))) - { - ERR("Failed to allocate D3D10 effect object memory\n"); - return E_OUTOFMEMORY; - } - - wine_rb_init(&object->types, d3d10_effect_type_compare); - object->ID3D10Effect_iface.lpVtbl = &d3d10_effect_vtbl; - object->refcount = 1; - ID3D10Device_AddRef(device); - object->device = device; - - hr = d3d10_effect_parse(object, data, data_size); - if (FAILED(hr)) - { - ERR("Failed to parse effect\n"); - IUnknown_Release(&object->ID3D10Effect_iface); - return hr; - } - - *effect = &object->ID3D10Effect_iface; - - TRACE("Created ID3D10Effect %p\n", object); - - return S_OK; -} - HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const char *filename, const D3D10_SHADER_MACRO *defines, ID3D10Include *include, UINT hlsl_flags, UINT fx_flags, ID3D10Blob **effect, ID3D10Blob **errors) @@ -287,15 +243,6 @@ HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const NULL, "fx_4_0", hlsl_flags, fx_flags, effect, errors); } -HRESULT WINAPI D3D10CreateEffectPoolFromMemory(void *data, SIZE_T data_size, UINT fx_flags, - ID3D10Device *device, ID3D10EffectPool **effect_pool) -{ - FIXME("data %p, data_size %lu, fx_flags %#x, device %p, effect_pool %p stub.\n", - data, data_size, fx_flags, device, effect_pool); - - return E_NOTIMPL; -} - const char * WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device) { FIXME("device %p stub!\n", device); diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index e77d0691fcf..7342c2dbe23 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -8360,3 +8360,56 @@ static const struct ID3D10EffectTypeVtbl d3d10_effect_type_vtbl = d3d10_effect_type_GetMemberName, d3d10_effect_type_GetMemberSemantic, }; + +static int d3d10_effect_type_compare(const void *key, const struct wine_rb_entry *entry) +{ + const struct d3d10_effect_type *t = WINE_RB_ENTRY_VALUE(entry, const struct d3d10_effect_type, entry); + const DWORD *id = key; + + return *id - t->id; +} + +HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT flags, + ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3D10Effect **effect) +{ + struct d3d10_effect *object; + HRESULT hr; + + FIXME("data %p, data_size %lu, flags %#x, device %p, effect_pool %p, effect %p stub!\n", + data, data_size, flags, device, effect_pool, effect); + + if (!(object = heap_alloc_zero(sizeof(*object)))) + { + ERR("Failed to allocate D3D10 effect object memory\n"); + return E_OUTOFMEMORY; + } + + wine_rb_init(&object->types, d3d10_effect_type_compare); + object->ID3D10Effect_iface.lpVtbl = &d3d10_effect_vtbl; + object->refcount = 1; + ID3D10Device_AddRef(device); + object->device = device; + + hr = d3d10_effect_parse(object, data, data_size); + if (FAILED(hr)) + { + ERR("Failed to parse effect\n"); + IUnknown_Release(&object->ID3D10Effect_iface); + return hr; + } + + *effect = &object->ID3D10Effect_iface; + + TRACE("Created effect %p\n", object); + + return S_OK; +} + +HRESULT WINAPI D3D10CreateEffectPoolFromMemory(void *data, SIZE_T data_size, UINT fx_flags, + ID3D10Device *device, ID3D10EffectPool **effect_pool) +{ + FIXME("data %p, data_size %lu, fx_flags %#x, device %p, effect_pool %p stub.\n", + data, data_size, fx_flags, device, effect_pool); + + return E_NOTIMPL; +}

1 0