February 2022 - Wine-Commits

Jacek Caban : user32: Simplify icon delay handling.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: b13521367a3856385d8ad2d8006a197bdec02f8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b13521367a3856385d8ad2d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 22 13:42:36 2022 +0100 user32: Simplify icon delay handling. 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/user32/cursoricon.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 5eb7ddc695a..20cbf070334 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -62,7 +62,6 @@ struct cursoricon_frame { UINT width; /* frame-specific width */ UINT height; /* frame-specific height */ - UINT delay; /* frame-specific delay between this frame and the next (in jiffies) */ HBITMAP color; /* color bitmap */ HBITMAP alpha; /* pre-multiplied alpha bitmap for 32-bpp icons */ HBITMAP mask; /* mask bitmap (followed by color for 1-bpp icons) */ @@ -962,7 +961,6 @@ BOOL WINAPI NtUserSetCursorIconData( HCURSOR cursor, UNICODE_STRING *module, UNI memset( &frame_desc, 0, sizeof(frame_desc) ); frame_desc.delay = desc->frame_rates ? desc->frame_rates[i] : desc->delay; frame_desc.frames = &desc->frames[frame_id]; - frame_desc.frames->delay = frame_desc.delay; /* FIXME */ if (!(obj->ani.frames[i] = alloc_cursoricon_handle( obj->is_icon )) || !NtUserSetCursorIconData( obj->ani.frames[i], NULL, NULL, &frame_desc )) { @@ -1243,7 +1241,6 @@ static BOOL create_icon_frame( const BITMAPINFO *bmi, DWORD maxsize, POINT hotsp mask_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY ); } - frame->delay = ~0; frame->width = width; frame->height = height; frame->hotspot = hotspot; @@ -2137,20 +2134,16 @@ HCURSOR WINAPI GetCursorFrameInfo(HCURSOR hCursor, DWORD reserved, DWORD istep, } else if (istep < icon_steps) { - struct cursoricon_frame *frame; + struct cursoricon_object *frame; *num_steps = icon_steps; - frame = get_icon_frame( ptr, istep ); - if (get_icon_steps(ptr) == 1) + frame = get_icon_ptr( ptr->ani.frames[istep] ); + if (ptr->ani.num_steps == 1) *num_steps = ~0; else - *num_steps = get_icon_steps(ptr); - /* If this specific frame does not have a delay then use the global delay */ - if (frame->delay == ~0) - *rate_jiffies = ptr->delay; - else - *rate_jiffies = frame->delay; - release_icon_frame( ptr, frame ); + *num_steps = ptr->ani.num_steps; + *rate_jiffies = frame->delay; + release_user_handle_ptr( frame ); } }

1 0

Jacek Caban : user32: Use create_cursoricon_object in CreateIconIndirect.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: a37a0a94d40367b4885ea7438ac191c2aca9ae27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a37a0a94d40367b4885ea743… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 22 13:41:52 2022 +0100 user32: Use create_cursoricon_object in CreateIconIndirect. 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/user32/cursoricon.c | 73 ++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 42 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 556bc1b0f91..8b74f7ba4e8 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2373,10 +2373,10 @@ static void stretch_blt_icon( HDC hdc_dst, int dst_x, int dst_y, int dst_width, */ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) { + struct cursoricon_frame frame = { 0 }; + struct cursoricon_desc desc = { .frames = &frame }; BITMAP bmpXor, bmpAnd; - HICON hObj; - HBITMAP color = 0, mask; - int width, height; + HICON ret; HDC hdc; TRACE("color %p, mask %p, hotspot %ux%u, fIcon %d\n", @@ -2397,59 +2397,48 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) bmpXor.bmWidth, bmpXor.bmHeight, bmpXor.bmWidthBytes, bmpXor.bmPlanes, bmpXor.bmBitsPixel); - width = bmpXor.bmWidth; - height = bmpXor.bmHeight; - color = create_color_bitmap( width, height ); + frame.width = bmpXor.bmWidth; + frame.height = bmpXor.bmHeight; + frame.color = create_color_bitmap( frame.width, frame.height ); } else { - width = bmpAnd.bmWidth; - height = bmpAnd.bmHeight; + frame.width = bmpAnd.bmWidth; + frame.height = bmpAnd.bmHeight; } - mask = CreateBitmap( width, height, 1, 1, NULL ); + frame.mask = CreateBitmap( frame.width, frame.height, 1, 1, NULL ); hdc = CreateCompatibleDC( 0 ); - SelectObject( hdc, mask ); - stretch_blt_icon( hdc, 0, 0, width, height, iconinfo->hbmMask, bmpAnd.bmWidth, bmpAnd.bmHeight ); + SelectObject( hdc, frame.mask ); + stretch_blt_icon( hdc, 0, 0, frame.width, frame.height, iconinfo->hbmMask, + bmpAnd.bmWidth, bmpAnd.bmHeight ); - if (color) + if (frame.color) { - SelectObject( hdc, color ); - stretch_blt_icon( hdc, 0, 0, width, height, iconinfo->hbmColor, width, height ); + SelectObject( hdc, frame.color ); + stretch_blt_icon( hdc, 0, 0, frame.width, frame.height, iconinfo->hbmColor, + frame.width, frame.height ); } - else height /= 2; + else frame.height /= 2; DeleteDC( hdc ); - hObj = alloc_icon_handle( FALSE, 0 ); - if (hObj) - { - struct cursoricon_object *info = get_icon_ptr( hObj ); - struct cursoricon_frame *frame; - - info->is_icon = iconinfo->fIcon; - frame = get_icon_frame( info, 0 ); - frame->delay = ~0; - frame->width = width; - frame->height = height; - frame->color = color; - frame->mask = mask; - frame->alpha = create_alpha_bitmap( iconinfo->hbmColor, NULL, NULL ); - if (info->is_icon) - { - frame->hotspot.x = width / 2; - frame->hotspot.y = height / 2; - } - else - { - frame->hotspot.x = iconinfo->xHotspot; - frame->hotspot.y = iconinfo->yHotspot; - } + frame.alpha = create_alpha_bitmap( iconinfo->hbmColor, NULL, NULL ); - release_icon_frame( info, frame ); - release_user_handle_ptr( info ); + if (iconinfo->fIcon) + { + frame.hotspot.x = frame.width / 2; + frame.hotspot.y = frame.height / 2; + } + else + { + frame.hotspot.x = iconinfo->xHotspot; + frame.hotspot.y = iconinfo->yHotspot; } - return hObj; + + ret = create_cursoricon_object( &desc, iconinfo->fIcon, 0, 0, 0 ); + if (!ret) free_icon_frame( &frame ); + return ret; } /******************************************************************************

1 0

Jacek Caban : user32: Use a single struct for static and animated cursor icons.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 64bc66846327f7f1a3975ea3de6a9c31e759d6a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64bc66846327f7f1a3975ea3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 22 13:40:10 2022 +0100 user32: Use a single struct for static and animated cursor icons. Handle allocation should use a separate from data initialization, so its object layout needs to be independent on data. 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/user32/cursoricon.c | 117 ++++++++++++++++++----------------------------- 1 file changed, 45 insertions(+), 72 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 59c50ae53d8..2b421cd1bf1 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -81,20 +81,16 @@ struct cursoricon_object BOOL is_ani; /* whether this object is a static cursor or an animated cursor */ UINT delay; /* delay between this frame and the next (in jiffies) */ POINT hotspot; -}; - -struct static_cursoricon_object -{ - struct cursoricon_object shared; - struct cursoricon_frame frame; /* frame-specific icon data */ -}; - -struct animated_cursoricon_object -{ - struct cursoricon_object shared; - UINT num_frames; /* number of frames in the icon/cursor */ - UINT num_steps; /* number of sequence steps in the icon/cursor */ - HICON frames[1]; /* list of animated cursor frames */ + union + { + struct cursoricon_frame frame; /* frame-specific icon data */ + struct + { + UINT num_frames; /* number of frames in the icon/cursor */ + UINT num_steps; /* number of sequence steps in the icon/cursor */ + HICON *frames; /* list of animated cursor frames */ + } ani; + }; }; static HBITMAP create_color_bitmap( int width, int height ) @@ -116,28 +112,28 @@ static int get_display_bpp(void) static HICON alloc_icon_handle( BOOL is_ani, UINT num_steps ) { struct cursoricon_object *obj; - int icon_size; HICON handle; - if (is_ani) - icon_size = FIELD_OFFSET( struct animated_cursoricon_object, frames[num_steps] ); - else - icon_size = sizeof( struct static_cursoricon_object ); - obj = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, icon_size ); - if (!obj) return NULL; - + if (!(obj = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj) ))) return NULL; obj->delay = 0; obj->is_ani = is_ani; if (is_ani) { - struct animated_cursoricon_object *ani_icon_data = (struct animated_cursoricon_object *) obj; - - ani_icon_data->num_steps = num_steps; - ani_icon_data->num_frames = num_steps; /* changed later for some animated cursors */ + if (!(obj->ani.frames = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, + num_steps * sizeof(*obj->ani.frames) ))) + { + HeapFree( GetProcessHeap(), 0, obj ); + return NULL; + } + obj->ani.num_steps = num_steps; + obj->ani.num_frames = num_steps; /* changed later for some animated cursors */ } if (!(handle = alloc_user_handle( &obj->obj, USER_ICON ))) + { + if (obj->is_ani) HeapFree( GetProcessHeap(), 0, obj->ani.frames ); HeapFree( GetProcessHeap(), 0, obj ); + } return handle; } @@ -154,21 +150,10 @@ static struct cursoricon_object *get_icon_ptr( HICON handle ) static struct cursoricon_frame *get_icon_frame( struct cursoricon_object *obj, int istep ) { - struct static_cursoricon_object *req_frame; - - if (obj->is_ani) - { - struct animated_cursoricon_object *ani_icon_data; - struct cursoricon_object *frameobj; - - ani_icon_data = (struct animated_cursoricon_object *) obj; - if (!(frameobj = get_icon_ptr( ani_icon_data->frames[istep] ))) - return 0; - req_frame = (struct static_cursoricon_object *) frameobj; - } - else - req_frame = (struct static_cursoricon_object *) obj; + struct cursoricon_object *req_frame; + if (!obj->is_ani) return &obj->frame; + if (!(req_frame = get_icon_ptr( obj->ani.frames[istep] ))) return 0; return &req_frame->frame; } @@ -178,21 +163,14 @@ static void release_icon_frame( struct cursoricon_object *obj, struct cursoricon { struct cursoricon_object *frameobj; - frameobj = (struct cursoricon_object *) (((char *)frame) - FIELD_OFFSET(struct static_cursoricon_object, frame)); + frameobj = (struct cursoricon_object *) (((char *)frame) - FIELD_OFFSET(struct cursoricon_object, frame)); release_user_handle_ptr( frameobj ); } } static UINT get_icon_steps( struct cursoricon_object *obj ) { - if (obj->is_ani) - { - struct animated_cursoricon_object *ani_icon_data; - - ani_icon_data = (struct animated_cursoricon_object *) obj; - return ani_icon_data->num_steps; - } - return 1; + return obj->is_ani ? obj->ani.num_steps : 1; } static BOOL free_icon_handle( HICON handle ) @@ -218,24 +196,22 @@ static BOOL free_icon_handle( HICON handle ) } else { - struct animated_cursoricon_object *ani_icon_data = (struct animated_cursoricon_object *) obj; - - for (i=0; i<ani_icon_data->num_steps; i++) + for (i = 0; i < obj->ani.num_steps; i++) { - HICON hFrame = ani_icon_data->frames[i]; + HICON hFrame = obj->ani.frames[i]; if (hFrame) { UINT j; - free_icon_handle( ani_icon_data->frames[i] ); - for (j=0; j<ani_icon_data->num_steps; j++) + free_icon_handle( obj->ani.frames[i] ); + for (j=0; j < obj->ani.num_steps; j++) { - if (ani_icon_data->frames[j] == hFrame) - ani_icon_data->frames[j] = 0; + if (obj->ani.frames[j] == hFrame) obj->ani.frames[j] = 0; } } } + HeapFree( GetProcessHeap(), 0, obj->ani.frames ); } if (!IS_INTRESOURCE( obj->resname )) HeapFree( GetProcessHeap(), 0, obj->resname ); HeapFree( GetProcessHeap(), 0, obj ); @@ -1354,7 +1330,6 @@ static void riff_find_chunk( DWORD chunk_id, DWORD chunk_type, const riff_chunk_ static HCURSOR CURSORICON_CreateIconFromANI( const BYTE *bits, DWORD bits_size, INT width, INT height, INT depth, BOOL is_icon, UINT loadflags ) { - struct animated_cursoricon_object *ani_icon_data; struct cursoricon_object *info; DWORD *frame_rates = NULL; DWORD *frame_seq = NULL; @@ -1434,9 +1409,8 @@ static HCURSOR CURSORICON_CreateIconFromANI( const BYTE *bits, DWORD bits_size, } info = get_icon_ptr( cursor ); - ani_icon_data = (struct animated_cursoricon_object *) info; info->is_icon = is_icon; - ani_icon_data->num_frames = header.num_frames; + info->ani.num_frames = header.num_frames; /* The .ANI stores the display rate in jiffies (1/60s) */ info->delay = header.display_rate; @@ -1484,7 +1458,7 @@ static HCURSOR CURSORICON_CreateIconFromANI( const BYTE *bits, DWORD bits_size, if (i == 0) { FIXME_(cursor)("Completely failed to create animated cursor!\n"); - ani_icon_data->num_frames = 0; + info->ani.num_frames = 0; release_user_handle_ptr( info ); free_icon_handle( cursor ); HeapFree( GetProcessHeap(), 0, frames ); @@ -1502,26 +1476,26 @@ static HCURSOR CURSORICON_CreateIconFromANI( const BYTE *bits, DWORD bits_size, if (error) { FIXME_(cursor)("Error creating animated cursor, only using first frame!\n"); - for (i=1; i<ani_icon_data->num_frames; i++) - free_icon_handle( ani_icon_data->frames[i] ); + for (i=1; i < info->ani.num_frames; i++) + free_icon_handle( info->ani.frames[i] ); use_seq = FALSE; info->delay = 0; - ani_icon_data->num_steps = 1; - ani_icon_data->num_frames = 1; + info->ani.num_steps = 1; + info->ani.num_frames = 1; } /* Setup the animated frames in the correct sequence */ - for (i=0; i<ani_icon_data->num_steps; i++) + for (i=0; i < info->ani.num_steps; i++) { DWORD frame_id = use_seq ? frame_seq[i] : i; struct cursoricon_frame *frame; - if (frame_id >= ani_icon_data->num_frames) + if (frame_id >= info->ani.num_frames) { - frame_id = ani_icon_data->num_frames-1; + frame_id = info->ani.num_frames-1; ERR_(cursor)("Sequence indicates frame past end of list, corrupt?\n"); } - ani_icon_data->frames[i] = frames[frame_id]; + info->ani.frames[i] = frames[frame_id]; frame = get_icon_frame( info, i ); if (frame_rates) frame->delay = frame_rates[i]; @@ -2094,13 +2068,12 @@ HCURSOR WINAPI GetCursorFrameInfo(HCURSOR hCursor, DWORD reserved, DWORD istep, icon_steps = get_icon_steps(ptr); if (istep < icon_steps || !ptr->is_ani) { - struct animated_cursoricon_object *ani_icon_data = (struct animated_cursoricon_object *) ptr; UINT icon_frames = 1; if (ptr->is_ani) - icon_frames = ani_icon_data->num_frames; + icon_frames = ptr->ani.num_frames; if (ptr->is_ani && icon_frames > 1) - ret = ani_icon_data->frames[istep]; + ret = ptr->ani.frames[istep]; else ret = hCursor; if (icon_frames == 1)

1 0

Alexandre Julliard : kernelbase: Implement IsApiSetImplemented().
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 77973e7e720dabb57c76b0a971c07ff7e70d36b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77973e7e720dabb57c76b0a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 22 12:38:37 2022 +0100 kernelbase: Implement IsApiSetImplemented(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 1 - dlls/kernelbase/kernelbase.spec | 1 + dlls/kernelbase/loader.c | 16 ++++++++++++++++ include/winbase.h | 1 + 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 58dcfaaec99..6d44b50e122 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -1469,7 +1469,6 @@ static void test_apisets(void) return; } if (!pApiSetQueryApiSetPresenceEx) win_skip( "ApiSetQueryApiSetPresenceEx not implemented\n" ); - todo_wine if (!pIsApiSetImplemented) win_skip( "IsApiSetImplemented not implemented\n" ); for (i = 0; i < ARRAY_SIZE(tests); i++) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index a4c14184452..c1175af2f9f 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -868,6 +868,7 @@ # @ stub InternetTimeToSystemTimeW # @ stub InvalidateAppModelVersionCache @ stub InvalidateTzSpecificCache +@ stdcall IsApiSetImplemented(str) @ stdcall IsCharAlphaA(long) @ stdcall IsCharAlphaNumericA(long) @ stdcall IsCharAlphaNumericW(long) diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index 02d72cfbfbf..0fd2d7b7c99 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -467,6 +467,22 @@ FARPROC WINAPI DECLSPEC_HOTPATCH GetProcAddress( HMODULE module, LPCSTR function #endif /* __x86_64__ */ +/*********************************************************************** + * IsApiSetImplemented (kernelbase.@) + */ +BOOL WINAPI IsApiSetImplemented( LPCSTR name ) +{ + UNICODE_STRING str; + NTSTATUS status; + BOOLEAN in_schema, present; + + if (!RtlCreateUnicodeStringFromAsciiz( &str, name )) return FALSE; + status = ApiSetQueryApiSetPresenceEx( &str, &in_schema, &present ); + RtlFreeUnicodeString( &str ); + return !status && present; +} + + /*********************************************************************** * LoadLibraryA (kernelbase.@) */ diff --git a/include/winbase.h b/include/winbase.h index a8744eb417a..a0c62d710b9 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2406,6 +2406,7 @@ WINBASEAPI VOID WINAPI InitOnceInitialize(PINIT_ONCE); WINBASEAPI PSLIST_ENTRY WINAPI InterlockedFlushSList(PSLIST_HEADER); WINBASEAPI PSLIST_ENTRY WINAPI InterlockedPopEntrySList(PSLIST_HEADER); WINBASEAPI PSLIST_ENTRY WINAPI InterlockedPushEntrySList(PSLIST_HEADER, PSLIST_ENTRY); +WINBASEAPI BOOL WINAPI IsApiSetImplemented(LPCSTR); WINBASEAPI BOOL WINAPI IsBadCodePtr(FARPROC); WINBASEAPI BOOL WINAPI IsBadHugeReadPtr(LPCVOID,UINT_PTR); WINBASEAPI BOOL WINAPI IsBadHugeWritePtr(LPVOID,UINT_PTR);

1 0

Eric Pouech : wineps.drv: Enable compilation with long types.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: ceb06647db50f73c0e622453fd76190160056926 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ceb06647db50f73c0e622453… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:42:46 2022 +0100 wineps.drv: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/Makefile.in | 1 - dlls/wineps.drv/bitblt.c | 2 +- dlls/wineps.drv/builtin.c | 8 ++++---- dlls/wineps.drv/color.c | 2 +- dlls/wineps.drv/download.c | 4 ++-- dlls/wineps.drv/driver.c | 6 +++--- dlls/wineps.drv/escape.c | 10 +++++----- dlls/wineps.drv/font.c | 2 +- dlls/wineps.drv/graphics.c | 2 +- dlls/wineps.drv/init.c | 18 +++++++++--------- dlls/wineps.drv/pen.c | 2 +- dlls/wineps.drv/ppd.c | 4 ++-- dlls/wineps.drv/ps.c | 8 ++++---- dlls/wineps.drv/type1.c | 10 +++++----- dlls/wineps.drv/type42.c | 22 +++++++++++----------- 15 files changed, 50 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ceb06647db50f73c0e62…

1 0

Eric Pouech : wnaspi32: Enable compilation with long types.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 5ea3d5111825d8b990bb7ea352c9864e435f57d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ea3d5111825d8b990bb7ea3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:43:58 2022 +0100 wnaspi32: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wnaspi32/Makefile.in | 1 - dlls/wnaspi32/aspi.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wnaspi32/Makefile.in b/dlls/wnaspi32/Makefile.in index 6122ee8d8f6..5c3fa66e9d0 100644 --- a/dlls/wnaspi32/Makefile.in +++ b/dlls/wnaspi32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wnaspi32.dll IMPORTLIB = wnaspi32 IMPORTS = advapi32 diff --git a/dlls/wnaspi32/aspi.c b/dlls/wnaspi32/aspi.c index 903c618f9ba..ae2d24489f6 100644 --- a/dlls/wnaspi32/aspi.c +++ b/dlls/wnaspi32/aspi.c @@ -74,7 +74,7 @@ int ASPI_GetNumControllers(void) } RegCloseKey(hkeyScsi); - TRACE("Returning %d host adapters\n", num_ha ); + TRACE("Returning %ld host adapters\n", num_ha ); return num_ha; }

1 0

Alexandre Julliard : ntdll: Map imported apiset dlls to their target library.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 31e151362bc5e82a988a4f9ff4309697525eda3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=31e151362bc5e82a988a4f9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 22 11:43:04 2022 +0100 ntdll: Map imported apiset dlls to their target library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/loader.c | 1 - 2 files changed, 86 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 2c3e62f6e25..387f8b6b2d6 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -587,16 +587,102 @@ static WINE_MODREF *find_fileid_module( const struct file_id *id ) } +/****************************************************************************** + * get_apiset_entry + */ +static NTSTATUS get_apiset_entry( const API_SET_NAMESPACE *map, const WCHAR *name, ULONG len, + const API_SET_NAMESPACE_ENTRY **entry ) +{ + const API_SET_HASH_ENTRY *hash_entry; + ULONG hash, i, hash_len; + int min, max; + + if (len <= 4) return STATUS_INVALID_PARAMETER; + if (wcsnicmp( name, L"api-", 4 ) && wcsnicmp( name, L"ext-", 4 )) return STATUS_INVALID_PARAMETER; + if (!map) return STATUS_APISET_NOT_PRESENT; + + for (i = hash_len = 0; i < len; i++) + { + if (name[i] == '.') break; + if (name[i] == '-') hash_len = i; + } + for (i = hash = 0; i < hash_len; i++) + hash = hash * map->HashFactor + ((name[i] >= 'A' && name[i] <= 'Z') ? name[i] + 32 : name[i]); + + hash_entry = (API_SET_HASH_ENTRY *)((char *)map + map->HashOffset); + min = 0; + max = map->Count - 1; + while (min <= max) + { + int pos = (min + max) / 2; + if (hash_entry[pos].Hash < hash) min = pos + 1; + else if (hash_entry[pos].Hash > hash) max = pos - 1; + else + { + *entry = (API_SET_NAMESPACE_ENTRY *)((char *)map + map->EntryOffset) + hash_entry[pos].Index; + if ((*entry)->HashedLength != hash_len * sizeof(WCHAR)) break; + if (wcsnicmp( (WCHAR *)((char *)map + (*entry)->NameOffset), name, hash_len )) break; + return STATUS_SUCCESS; + } + } + return STATUS_APISET_NOT_PRESENT; +} + + +/****************************************************************************** + * get_apiset_target + */ +static NTSTATUS get_apiset_target( const API_SET_NAMESPACE *map, const API_SET_NAMESPACE_ENTRY *entry, + const WCHAR *host, UNICODE_STRING *ret ) +{ + const API_SET_VALUE_ENTRY *value = (API_SET_VALUE_ENTRY *)((char *)map + entry->ValueOffset); + ULONG i, len; + + if (!entry->ValueCount) return STATUS_DLL_NOT_FOUND; + if (host) + { + /* look for specific host in entries 1..n, entry 0 is the default */ + for (i = 1; i < entry->ValueCount; i++) + { + len = value[i].NameLength / sizeof(WCHAR); + if (!wcsnicmp( host, (WCHAR *)((char *)map + value[i].NameOffset), len ) && !host[len]) + { + value += i; + break; + } + } + } + if (!value->ValueOffset) return STATUS_DLL_NOT_FOUND; + ret->Buffer = (WCHAR *)((char *)map + value->ValueOffset); + ret->Length = value->ValueLength; + return STATUS_SUCCESS; +} + + /********************************************************************** * build_import_name */ static NTSTATUS build_import_name( WCHAR buffer[256], const char *import, int len ) { + const API_SET_NAMESPACE *map = NtCurrentTeb()->Peb->ApiSetMap; + const API_SET_NAMESPACE_ENTRY *entry; + const WCHAR *host = current_modref ? current_modref->ldr.BaseDllName.Buffer : NULL; + UNICODE_STRING str; + while (len && import[len-1] == ' ') len--; /* remove trailing spaces */ if (len + sizeof(".dll") > 256) return STATUS_DLL_NOT_FOUND; ascii_to_unicode( buffer, import, len ); buffer[len] = 0; if (!wcschr( buffer, '.' )) wcscpy( buffer + len, L".dll" ); + + if (get_apiset_entry( map, buffer, wcslen(buffer), &entry )) return STATUS_SUCCESS; + + if (get_apiset_target( map, entry, host, &str )) return STATUS_DLL_NOT_FOUND; + if (str.Length >= 256 * sizeof(WCHAR)) return STATUS_DLL_NOT_FOUND; + + TRACE( "found %s for %s\n", debugstr_us(&str), debugstr_w(buffer)); + memcpy( buffer, str.Buffer, str.Length ); + buffer[str.Length / sizeof(WCHAR)] = 0; return STATUS_SUCCESS; } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 98a5c933215..ab12a4ea1c0 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -2055,7 +2055,6 @@ static void load_apiset_dll(void) { NtCurrentTeb()->Peb->ApiSetMap = map; if (wow_peb) wow_peb->ApiSetMap = PtrToUlong(map); - NtUnmapViewOfSection( NtCurrentProcess(), ptr ); TRACE( "loaded %s apiset at %p\n", debugstr_w(path), map ); return; }

1 0

Eric Pouech : wmp: Enable compilation with long types.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: b3f3e684a6288041b21451f7d87a2798ddf68b66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3f3e684a6288041b21451f7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:43:46 2022 +0100 wmp: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/Makefile.in | 1 - dlls/wmp/events.c | 10 +++---- dlls/wmp/oleobj.c | 40 ++++++++++++------------- dlls/wmp/player.c | 84 ++++++++++++++++++++++++++-------------------------- dlls/wmp/wmp_main.c | 6 ++-- 5 files changed, 70 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b3f3e684a6288041b214…

1 0

Eric Pouech : windows.globalization: Enable compilation with long types.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 05f0b754bc64fb787b7c9b44819888234c441e29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05f0b754bc64fb787b7c9b44… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:42:28 2022 +0100 windows.globalization: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.globalization/Makefile.in | 1 - dlls/windows.globalization/main.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/windows.globalization/Makefile.in b/dlls/windows.globalization/Makefile.in index 84e78eb2842..d29c44ea746 100644 --- a/dlls/windows.globalization/Makefile.in +++ b/dlls/windows.globalization/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = windows.globalization.dll IMPORTS = combase uuid diff --git a/dlls/windows.globalization/main.c b/dlls/windows.globalization/main.c index e8fcd46ef63..3e5a59bde14 100644 --- a/dlls/windows.globalization/main.c +++ b/dlls/windows.globalization/main.c @@ -87,7 +87,7 @@ static ULONG STDMETHODCALLTYPE hstring_vector_AddRef(IVectorView_HSTRING *iface) { struct hstring_vector *impl = impl_from_IVectorView_HSTRING(iface); ULONG ref = InterlockedIncrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; } @@ -95,7 +95,7 @@ static ULONG STDMETHODCALLTYPE hstring_vector_Release(IVectorView_HSTRING *iface { struct hstring_vector *impl = impl_from_IVectorView_HSTRING(iface); ULONG ref = InterlockedDecrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); if (ref == 0) { while (impl->count--) WindowsDeleteString(impl->values[impl->count]); @@ -275,7 +275,7 @@ static ULONG STDMETHODCALLTYPE windows_globalization_AddRef( { struct windows_globalization *impl = impl_from_IActivationFactory(iface); ULONG ref = InterlockedIncrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; } @@ -284,7 +284,7 @@ static ULONG STDMETHODCALLTYPE windows_globalization_Release( { struct windows_globalization *impl = impl_from_IActivationFactory(iface); ULONG ref = InterlockedDecrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; }

1 0

Eric Pouech : windows.media.speech: Enable compilation with long types.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: f0f4e105f104e8e0634aec0b5449729bb6ad9f56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0f4e105f104e8e0634aec0b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:42:40 2022 +0100 windows.media.speech: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/Makefile.in | 1 - dlls/windows.media.speech/main.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/windows.media.speech/Makefile.in b/dlls/windows.media.speech/Makefile.in index fc01608d62c..9fbff8e132f 100644 --- a/dlls/windows.media.speech/Makefile.in +++ b/dlls/windows.media.speech/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = windows.media.speech.dll IMPORTS = combase uuid diff --git a/dlls/windows.media.speech/main.c b/dlls/windows.media.speech/main.c index b607f9a8203..d14d06773f7 100644 --- a/dlls/windows.media.speech/main.c +++ b/dlls/windows.media.speech/main.c @@ -81,7 +81,7 @@ static ULONG STDMETHODCALLTYPE vector_view_voice_information_AddRef( { struct voice_information_vector *impl = impl_from_IVectorView_VoiceInformation(iface); ULONG ref = InterlockedIncrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; } @@ -90,7 +90,7 @@ static ULONG STDMETHODCALLTYPE vector_view_voice_information_Release( { struct voice_information_vector *impl = impl_from_IVectorView_VoiceInformation(iface); ULONG ref = InterlockedDecrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; } @@ -222,7 +222,7 @@ static ULONG STDMETHODCALLTYPE speech_synthesizer_AddRef( struct speech_synthesizer *impl = impl_from_ISpeechSynthesizer(iface); ULONG ref = InterlockedIncrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; } @@ -233,7 +233,7 @@ static ULONG STDMETHODCALLTYPE speech_synthesizer_Release( struct speech_synthesizer *impl = impl_from_ISpeechSynthesizer(iface); ULONG ref = InterlockedDecrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); if (!ref) free(impl); @@ -326,7 +326,7 @@ static ULONG STDMETHODCALLTYPE closable_AddRef( struct speech_synthesizer *impl = impl_from_IClosable(iface); ULONG ref = InterlockedIncrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; } @@ -337,7 +337,7 @@ static ULONG STDMETHODCALLTYPE closable_Release( struct speech_synthesizer *impl = impl_from_IClosable(iface); ULONG ref = InterlockedDecrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); if (!ref) free(impl); @@ -442,7 +442,7 @@ static ULONG STDMETHODCALLTYPE windows_media_speech_AddRef( { struct windows_media_speech *impl = impl_from_IActivationFactory(iface); ULONG ref = InterlockedIncrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; } @@ -451,7 +451,7 @@ static ULONG STDMETHODCALLTYPE windows_media_speech_Release( { struct windows_media_speech *impl = impl_from_IActivationFactory(iface); ULONG ref = InterlockedDecrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; }

1 0