November 2023 - Wine-commits

Aida Jonikienė : wined3d: Add extra debug info to shader_set_limits().
by Alexandre Julliard 30 Nov '23

30 Nov '23

Module: wine Branch: master Commit: 9cfb95964bcf16ea0563fe7a854197c17803b47d URL: https://gitlab.winehq.org/wine/wine/-/commit/9cfb95964bcf16ea0563fe7a854197… Author: Aida Jonikienė <aidas957(a)gmail.com> Date: Sun Nov 26 11:40:31 2023 +0200 wined3d: Add extra debug info to shader_set_limits(). This should help understand some virgl/ChromeOS-specific WineD3D behavior better. --- dlls/wined3d/shader.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b58546db875..d6f2ce71496 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -638,9 +638,10 @@ static void shader_set_limits(struct wined3d_shader *shader) } if (!shader->limits) { - FIXME("Unexpected shader version \"%u.%u\".\n", + FIXME("Unexpected shader version \"%u.%u\" (shader type %u).\n", shader->reg_maps.shader_version.major, - shader->reg_maps.shader_version.minor); + shader->reg_maps.shader_version.minor, + shader->reg_maps.shader_version.type); shader->limits = &limits_array[max(0, i - 1)].limits; } }

1 0

Nikolay Sivov : gdi32/emf: Add a helper to pad variable length record data.
by Alexandre Julliard 30 Nov '23

30 Nov '23

Module: wine Branch: master Commit: 30be9059726f6f9de26e71e405123114b8e3c33f URL: https://gitlab.winehq.org/wine/wine/-/commit/30be9059726f6f9de26e71e4051231… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 27 08:30:36 2023 +0100 gdi32/emf: Add a helper to pad variable length record data. --- dlls/gdi32/emfdc.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 231b4ae217d..83e1b27d27b 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -30,6 +30,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile); +static inline UINT aligned_size(UINT size) +{ + return (size + 3) & ~3; +} + +static inline void pad_record(void *record, UINT size) +{ + if (size & 3) memset((char *)record + size, 0, 4 - (size & 3)); +} struct emf { @@ -1159,7 +1168,7 @@ BOOL EMFDC_PolyDraw( DC_ATTR *dc_attr, const POINT *pts, const BYTE *types, DWOR size = use_small_emr ? offsetof( EMRPOLYDRAW16, apts[count] ) : offsetof( EMRPOLYDRAW, aptl[count] ); - size += (count + 3) & ~3; + size += aligned_size(count); if (!(emr = HeapAlloc( GetProcessHeap(), 0, size ))) return FALSE; @@ -1169,7 +1178,7 @@ BOOL EMFDC_PolyDraw( DC_ATTR *dc_attr, const POINT *pts, const BYTE *types, DWOR types_dest = store_points( emr->aptl, pts, count, use_small_emr ); memcpy( types_dest, types, count ); - if (count & 3) memset( types_dest + count, 0, 4 - (count & 3) ); + pad_record( types_dest, count ); if (!emf->path) get_points_bounds( &emr->rclBounds, pts, count, 0 ); @@ -2510,7 +2519,7 @@ BOOL WINAPI GdiComment( HDC hdc, UINT bytes, const BYTE *buffer ) if (!(dc_attr = get_dc_attr( hdc )) || !get_dc_emf( dc_attr )) return FALSE; - rounded_size = (bytes+3) & ~3; + rounded_size = aligned_size(bytes); total = offsetof(EMRGDICOMMENT,Data) + rounded_size; emr = HeapAlloc(GetProcessHeap(), 0, total);

1 0

Nikolay Sivov : gdi32/emf: Use padding helper in GdiComment().
by Alexandre Julliard 30 Nov '23

30 Nov '23

Module: wine Branch: master Commit: 47a939e2ad59c0191c98f5370c8530bcf5013e7a URL: https://gitlab.winehq.org/wine/wine/-/commit/47a939e2ad59c0191c98f5370c8530… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 27 08:35:56 2023 +0100 gdi32/emf: Use padding helper in GdiComment(). --- dlls/gdi32/emfdc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 83e1b27d27b..a3e263ae2a0 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -2514,20 +2514,19 @@ BOOL WINAPI GdiComment( HDC hdc, UINT bytes, const BYTE *buffer ) { DC_ATTR *dc_attr; EMRGDICOMMENT *emr; - UINT total, rounded_size; + UINT total; BOOL ret; if (!(dc_attr = get_dc_attr( hdc )) || !get_dc_emf( dc_attr )) return FALSE; - rounded_size = aligned_size(bytes); - total = offsetof(EMRGDICOMMENT,Data) + rounded_size; + total = offsetof(EMRGDICOMMENT,Data) + aligned_size(bytes); emr = HeapAlloc(GetProcessHeap(), 0, total); emr->emr.iType = EMR_GDICOMMENT; emr->emr.nSize = total; emr->cbData = bytes; - memset(&emr->Data[bytes], 0, rounded_size - bytes); memcpy(&emr->Data[0], buffer, bytes); + pad_record(&emr->Data[0], bytes); ret = emfdc_record( get_dc_emf( dc_attr ), &emr->emr );

1 0

Nikolay Sivov : gdi32/emf: Check for allocation failure in GdiComment().
by Alexandre Julliard 30 Nov '23

30 Nov '23

Module: wine Branch: master Commit: 4fac4588bb5260b717c9bbeffabd33b06ac0a33b URL: https://gitlab.winehq.org/wine/wine/-/commit/4fac4588bb5260b717c9bbeffabd33… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 27 08:42:15 2023 +0100 gdi32/emf: Check for allocation failure in GdiComment(). --- dlls/gdi32/emfdc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index a3e263ae2a0..0d53fe8d553 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -2522,6 +2522,9 @@ BOOL WINAPI GdiComment( HDC hdc, UINT bytes, const BYTE *buffer ) total = offsetof(EMRGDICOMMENT,Data) + aligned_size(bytes); emr = HeapAlloc(GetProcessHeap(), 0, total); + if (!emr) + return FALSE; + emr->emr.iType = EMR_GDICOMMENT; emr->emr.nSize = total; emr->cbData = bytes;

1 0

Nikolay Sivov : gdi32/emf: Add description field padding.
by Alexandre Julliard 30 Nov '23

30 Nov '23

Module: wine Branch: master Commit: 169a23a14029edc00f47ad6e6a1a14402ace50c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/169a23a14029edc00f47ad6e6a1a14… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 27 08:50:40 2023 +0100 gdi32/emf: Add description field padding. --- dlls/gdi32/emfdc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 0d53fe8d553..c8b7327ce5b 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -2638,6 +2638,7 @@ static struct emf *emf_create( HDC hdc, const RECT *rect, const WCHAR *descripti DWORD size = 0, length = 0; DC_ATTR *dc_attr; struct emf *emf; + void *ptr; if (!(dc_attr = get_dc_attr( hdc )) || !(emf = HeapAlloc( GetProcessHeap(), 0, sizeof(*emf) ))) return NULL; @@ -2649,7 +2650,7 @@ static struct emf *emf_create( HDC hdc, const RECT *rect, const WCHAR *descripti length += 3; length *= 2; } - size = sizeof(ENHMETAHEADER) + (length + 3) / 4 * 4; + size = sizeof(ENHMETAHEADER) + aligned_size(length); if (!(emf->emh = HeapAlloc( GetProcessHeap(), 0, size )) || !(emf->handles = HeapAlloc( GetProcessHeap(), 0, @@ -2674,7 +2675,8 @@ static struct emf *emf_create( HDC hdc, const RECT *rect, const WCHAR *descripti emf->emh->nDescription = length / 2; emf->emh->offDescription = length ? sizeof(ENHMETAHEADER) : 0; - memcpy( (char *)emf->emh + sizeof(ENHMETAHEADER), description, length ); + ptr = memcpy( (char *)emf->emh + sizeof(ENHMETAHEADER), description, length ); + pad_record( ptr, length ); emf_reset( dc_attr, rect ); return emf;

1 0

Nikolay Sivov : gdi32/emf: Align and pad bitmap data in EMRSTRETCHDIBITS records.
by Alexandre Julliard 30 Nov '23

30 Nov '23

Module: wine Branch: master Commit: e63b00b1ad603e89242f503dc1af9060dbbc9311 URL: https://gitlab.winehq.org/wine/wine/-/commit/e63b00b1ad603e89242f503dc1af90… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 27 09:08:38 2023 +0100 gdi32/emf: Align and pad bitmap data in EMRSTRETCHDIBITS records. --- dlls/gdi32/emfdc.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index c8b7327ce5b..a93696d0446 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -1899,13 +1899,14 @@ BOOL EMFDC_StretchDIBits( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, UINT bmi_size, img_size, payload_size, emr_size; BITMAPINFOHEADER bih; BITMAPINFO *bi; + void *ptr; /* calculate the size of the colour table and the image */ if (!emf_parse_user_bitmapinfo( &bih, &info->bmiHeader, usage, TRUE, &bmi_size, &img_size )) return 0; /* check for overflows */ - payload_size = bmi_size + img_size; + payload_size = aligned_size(bmi_size) + aligned_size(img_size); if (payload_size < bmi_size) return 0; emr_size = sizeof (EMRSTRETCHDIBITS) + payload_size; @@ -1914,14 +1915,6 @@ BOOL EMFDC_StretchDIBits( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, /* allocate record */ if (!(emr = HeapAlloc(GetProcessHeap(), 0, emr_size ))) return 0; - /* write a bitmap info header (with colours) to the record */ - bi = (BITMAPINFO *)&emr[1]; - bi->bmiHeader = bih; - emf_copy_colours_from_user_bitmapinfo( bi, info, usage ); - - /* write bitmap bits to the record */ - memcpy ( (BYTE *)&emr[1] + bmi_size, bits, img_size ); - /* fill in the EMR header at the front of our piece of memory */ emr->emr.iType = EMR_STRETCHDIBITS; emr->emr.nSize = emr_size; @@ -1937,7 +1930,7 @@ BOOL EMFDC_StretchDIBits( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, emr->iUsageSrc = usage; emr->offBmiSrc = sizeof (EMRSTRETCHDIBITS); emr->cbBmiSrc = bmi_size; - emr->offBitsSrc = emr->offBmiSrc + bmi_size; + emr->offBitsSrc = emr->offBmiSrc + aligned_size(bmi_size); emr->cbBitsSrc = img_size; emr->cxSrc = width_src; @@ -1948,6 +1941,16 @@ BOOL EMFDC_StretchDIBits( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, emr->rclBounds.right = x_dst + width_dst - 1; emr->rclBounds.bottom = y_dst + height_dst - 1; + /* write a bitmap info header (with colours) to the record */ + bi = (BITMAPINFO *)((BYTE *)emr + emr->offBmiSrc); + bi->bmiHeader = bih; + emf_copy_colours_from_user_bitmapinfo( bi, info, usage ); + pad_record( bi, emr->cbBmiSrc ); + + /* write bitmap bits to the record */ + ptr = memcpy ( (BYTE *)emr + emr->offBitsSrc, bits, img_size ); + pad_record( ptr, emr->cbBitsSrc ); + /* save the record we just created */ ret = emfdc_record( get_dc_emf( dc_attr ), &emr->emr ); if (ret) emfdc_update_bounds( get_dc_emf( dc_attr ), &emr->rclBounds );

1 0

Alex Henrie : uxtheme: Annotate UXINI_LoadINI with __WINE_DEALLOC.
by Alexandre Julliard 30 Nov '23

30 Nov '23

Module: wine Branch: master Commit: 9947637469a34ffa405c59f6a6ebb41155b683f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/9947637469a34ffa405c59f6a6ebb4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 27 22:40:21 2023 -0700 uxtheme: Annotate UXINI_LoadINI with __WINE_DEALLOC. --- dlls/uxtheme/msstyles.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uxtheme/msstyles.h b/dlls/uxtheme/msstyles.h index 38ff94d8c80..b2b0e0d8f22 100644 --- a/dlls/uxtheme/msstyles.h +++ b/dlls/uxtheme/msstyles.h @@ -113,8 +113,8 @@ HRESULT MSSTYLES_GetPropertyString(PTHEME_PROPERTY tp, LPWSTR pszBuff, int cchMa HRESULT MSSTYLES_GetPropertyRect(PTHEME_PROPERTY tp, RECT *pRect); HRESULT MSSTYLES_GetPropertyMargins(PTHEME_PROPERTY tp, RECT *prc, MARGINS *pMargins); -PUXINI_FILE UXINI_LoadINI(HMODULE hTheme, LPCWSTR lpName); void UXINI_CloseINI(PUXINI_FILE uf); +PUXINI_FILE UXINI_LoadINI(HMODULE hTheme, const WCHAR *name) __WINE_DEALLOC(UXINI_CloseINI); LPCWSTR UXINI_GetNextSection(PUXINI_FILE uf, DWORD *dwLen); BOOL UXINI_FindSection(PUXINI_FILE uf, LPCWSTR lpName); LPCWSTR UXINI_GetNextValue(PUXINI_FILE uf, DWORD *dwNameLen, LPCWSTR *lpValue, DWORD *dwValueLen);

1 0

Alex Henrie : uxtheme: Use CRT allocation functions.
by Alexandre Julliard 30 Nov '23

30 Nov '23

Module: wine Branch: master Commit: 4c4eb1129c489f89dc48106d5a25f198fda46ffc URL: https://gitlab.winehq.org/wine/wine/-/commit/4c4eb1129c489f89dc48106d5a25f1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 27 22:40:21 2023 -0700 uxtheme: Use CRT allocation functions. --- dlls/uxtheme/buffer.c | 5 ++--- dlls/uxtheme/msstyles.c | 23 +++++++++++------------ dlls/uxtheme/uxini.c | 5 ++--- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/uxtheme/buffer.c b/dlls/uxtheme/buffer.c index f159d5c1be0..7003d3da3bc 100644 --- a/dlls/uxtheme/buffer.c +++ b/dlls/uxtheme/buffer.c @@ -30,7 +30,6 @@ #include "uxtheme.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); @@ -47,7 +46,7 @@ static void free_paintbuffer(struct paintbuffer *buffer) { DeleteObject(buffer->bitmap); DeleteDC(buffer->memorydc); - heap_free(buffer); + free(buffer); } static struct paintbuffer *get_buffer_obj(HPAINTBUFFER handle) @@ -95,7 +94,7 @@ HPAINTBUFFER WINAPI BeginBufferedPaint(HDC targetdc, const RECT *rect, if (params) FIXME("painting parameters are ignored\n"); - buffer = heap_alloc(sizeof(*buffer)); + buffer = malloc(sizeof(*buffer)); buffer->targetdc = targetdc; buffer->rect = *rect; buffer->memorydc = CreateCompatibleDC(targetdc); diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 76d2f760b58..71603953ed2 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -34,7 +34,6 @@ #include "wine/exception.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); @@ -162,7 +161,7 @@ HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWST goto invalid_theme; } - *tf = heap_alloc_zero(sizeof(THEME_FILE)); + *tf = calloc(1, sizeof(THEME_FILE)); (*tf)->hTheme = hTheme; GetFullPathNameW(lpThemeFile, MAX_PATH, (*tf)->szThemeFile, NULL); @@ -204,14 +203,14 @@ void MSSTYLES_CloseThemeFile(PTHEME_FILE tf) while(ps->properties) { PTHEME_PROPERTY prop = ps->properties; ps->properties = prop->next; - heap_free(prop); + free(prop); } pcls->partstate = ps->next; - heap_free(ps); + free(ps); } pcls->signature = 0; - heap_free(pcls); + free(pcls); } } while (tf->images) @@ -219,9 +218,9 @@ void MSSTYLES_CloseThemeFile(PTHEME_FILE tf) PTHEME_IMAGE img = tf->images; tf->images = img->next; DeleteObject (img->image); - heap_free(img); + free(img); } - heap_free(tf); + free(tf); } } } @@ -448,7 +447,7 @@ static PTHEME_CLASS MSSTYLES_AddClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWST PTHEME_CLASS cur = MSSTYLES_FindClass(tf, pszAppName, pszClassName); if(cur) return cur; - cur = heap_alloc(sizeof(*cur)); + cur = malloc(sizeof(*cur)); cur->signature = THEME_CLASS_SIGNATURE; cur->refcount = 0; cur->hTheme = tf->hTheme; @@ -537,7 +536,7 @@ static PTHEME_PARTSTATE MSSTYLES_AddPartState(PTHEME_CLASS tc, int iPartId, int PTHEME_PARTSTATE cur = MSSTYLES_FindPartState(tc, iPartId, iStateId, NULL); if(cur) return cur; - cur = heap_alloc(sizeof(*cur)); + cur = malloc(sizeof(*cur)); cur->iPartId = iPartId; cur->iStateId = iStateId; cur->properties = NULL; @@ -654,7 +653,7 @@ static PTHEME_PROPERTY MSSTYLES_AddProperty(PTHEME_PARTSTATE ps, int iPropertyPr /* Should duplicate properties overwrite the original, or be ignored? */ if(cur) return cur; - cur = heap_alloc(sizeof(*cur)); + cur = malloc(sizeof(*cur)); cur->iPrimitiveType = iPropertyPrimitive; cur->iPropertyId = iPropertyId; cur->lpValue = lpValue; @@ -695,7 +694,7 @@ static PTHEME_PROPERTY MSSTYLES_AddMetric(PTHEME_FILE tf, int iPropertyPrimitive /* Should duplicate properties overwrite the original, or be ignored? */ if(cur) return cur; - cur = heap_alloc(sizeof(*cur)); + cur = malloc(sizeof(*cur)); cur->iPrimitiveType = iPropertyPrimitive; cur->iPropertyId = iPropertyId; cur->lpValue = lpValue; @@ -1246,7 +1245,7 @@ HBITMAP MSSTYLES_LoadBitmap (PTHEME_CLASS tc, LPCWSTR lpFilename, BOOL* hasAlpha img = img->next; } /* Not found? Load from resources */ - img = heap_alloc(sizeof(*img)); + img = malloc(sizeof(*img)); img->image = LoadImageW(tc->hTheme, szFile, IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); prepare_alpha (img->image, hasAlpha); img->hasAlpha = *hasAlpha; diff --git a/dlls/uxtheme/uxini.c b/dlls/uxtheme/uxini.c index 41a0551f82b..a5bd3d65467 100644 --- a/dlls/uxtheme/uxini.c +++ b/dlls/uxtheme/uxini.c @@ -25,7 +25,6 @@ #include "winnls.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); @@ -70,7 +69,7 @@ PUXINI_FILE UXINI_LoadINI(HMODULE hTheme, LPCWSTR lpName) { } dwIniSize = SizeofResource(hTheme, hrsc) / sizeof(WCHAR); - uf = heap_alloc(sizeof(*uf)); + uf = malloc(sizeof(*uf)); uf->lpIni = lpThemesIni; uf->lpCurLoc = lpThemesIni; uf->lpEnd = lpThemesIni + dwIniSize; @@ -87,7 +86,7 @@ PUXINI_FILE UXINI_LoadINI(HMODULE hTheme, LPCWSTR lpName) { */ void UXINI_CloseINI(PUXINI_FILE uf) { - heap_free(uf); + free(uf); } /**********************************************************************

1 0

Alexandre Julliard : wineboot: Remove a noisy FIXME.
by Alexandre Julliard 29 Nov '23

29 Nov '23

Module: wine Branch: master Commit: ef9debff6052cf502e290fe128c0c10f98551c6a URL: https://gitlab.winehq.org/wine/wine/-/commit/ef9debff6052cf502e290fe128c0c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 29 20:36:15 2023 +0100 wineboot: Remove a noisy FIXME. --- programs/wineboot/wineboot.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 58fa6939a9a..d996aa83f95 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -350,7 +350,6 @@ static void initialize_xstate_features(struct _KUSER_SHARED_DATA *data) static UINT64 read_tsc_frequency(void) { - FIXME( "TSC frequency calibration not implemented\n" ); return 0; }

1 0

Alexandre Julliard : wineandroid.drv: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 29 Nov '23

29 Nov '23

Module: wine Branch: master Commit: 35b3ff8ad6b3d37fca1b5e2becedb7d079ebd4c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/35b3ff8ad6b3d37fca1b5e2becedb7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 29 20:51:07 2023 +0100 wineandroid.drv: Remove DECLSPEC_HIDDEN usage. --- dlls/wineandroid.drv/android.h | 108 ++++++++++++++++++++--------------------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index 2eb6a288a72..184fec8372b 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -42,7 +42,7 @@ * Android interface */ -#define DECL_FUNCPTR(f) extern typeof(f) * p##f DECLSPEC_HIDDEN +#define DECL_FUNCPTR(f) extern typeof(f) * p##f DECL_FUNCPTR( __android_log_print ); DECL_FUNCPTR( ANativeWindow_fromSurface ); DECL_FUNCPTR( ANativeWindow_release ); @@ -53,96 +53,96 @@ DECL_FUNCPTR( ANativeWindow_release ); * OpenGL driver */ -extern pthread_mutex_t drawable_mutex DECLSPEC_HIDDEN; -extern void update_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN; -extern void destroy_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN; -extern struct opengl_funcs *get_wgl_driver( UINT version ) DECLSPEC_HIDDEN; +extern pthread_mutex_t drawable_mutex; +extern void update_gl_drawable( HWND hwnd ); +extern void destroy_gl_drawable( HWND hwnd ); +extern struct opengl_funcs *get_wgl_driver( UINT version ); /************************************************************************** * Android pseudo-device */ -extern void start_android_device(void) DECLSPEC_HIDDEN; -extern void register_native_window( HWND hwnd, struct ANativeWindow *win, BOOL client ) DECLSPEC_HIDDEN; -extern struct ANativeWindow *create_ioctl_window( HWND hwnd, BOOL opengl, float scale ) DECLSPEC_HIDDEN; -extern struct ANativeWindow *grab_ioctl_window( struct ANativeWindow *window ) DECLSPEC_HIDDEN; -extern void release_ioctl_window( struct ANativeWindow *window ) DECLSPEC_HIDDEN; -extern void destroy_ioctl_window( HWND hwnd, BOOL opengl ) DECLSPEC_HIDDEN; +extern void start_android_device(void); +extern void register_native_window( HWND hwnd, struct ANativeWindow *win, BOOL client ); +extern struct ANativeWindow *create_ioctl_window( HWND hwnd, BOOL opengl, float scale ); +extern struct ANativeWindow *grab_ioctl_window( struct ANativeWindow *window ); +extern void release_ioctl_window( struct ANativeWindow *window ); +extern void destroy_ioctl_window( HWND hwnd, BOOL opengl ); extern int ioctl_window_pos_changed( HWND hwnd, const RECT *window_rect, const RECT *client_rect, const RECT *visible_rect, UINT style, UINT flags, - HWND after, HWND owner ) DECLSPEC_HIDDEN; -extern int ioctl_set_window_parent( HWND hwnd, HWND parent, float scale ) DECLSPEC_HIDDEN; -extern int ioctl_set_capture( HWND hwnd ) DECLSPEC_HIDDEN; + HWND after, HWND owner ); +extern int ioctl_set_window_parent( HWND hwnd, HWND parent, float scale ); +extern int ioctl_set_capture( HWND hwnd ); extern int ioctl_set_cursor( int id, int width, int height, - int hotspotx, int hotspoty, const unsigned int *bits ) DECLSPEC_HIDDEN; + int hotspotx, int hotspoty, const unsigned int *bits ); /************************************************************************** * USER driver */ -extern pthread_mutex_t win_data_mutex DECLSPEC_HIDDEN; -extern INT ANDROID_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) DECLSPEC_HIDDEN; -extern UINT ANDROID_MapVirtualKeyEx( UINT code, UINT maptype, HKL hkl ) DECLSPEC_HIDDEN; -extern SHORT ANDROID_VkKeyScanEx( WCHAR ch, HKL hkl ) DECLSPEC_HIDDEN; -extern void ANDROID_SetCursor( HWND hwnd, HCURSOR handle ) DECLSPEC_HIDDEN; -extern BOOL ANDROID_CreateDesktop( const WCHAR *name, UINT width, UINT height ) DECLSPEC_HIDDEN; -extern BOOL ANDROID_CreateWindow( HWND hwnd ) DECLSPEC_HIDDEN; -extern void ANDROID_DestroyWindow( HWND hwnd ) DECLSPEC_HIDDEN; -extern BOOL ANDROID_ProcessEvents( DWORD mask ) DECLSPEC_HIDDEN; -extern LRESULT ANDROID_DesktopWindowProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) DECLSPEC_HIDDEN; +extern pthread_mutex_t win_data_mutex; +extern INT ANDROID_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ); +extern UINT ANDROID_MapVirtualKeyEx( UINT code, UINT maptype, HKL hkl ); +extern SHORT ANDROID_VkKeyScanEx( WCHAR ch, HKL hkl ); +extern void ANDROID_SetCursor( HWND hwnd, HCURSOR handle ); +extern BOOL ANDROID_CreateDesktop( const WCHAR *name, UINT width, UINT height ); +extern BOOL ANDROID_CreateWindow( HWND hwnd ); +extern void ANDROID_DestroyWindow( HWND hwnd ); +extern BOOL ANDROID_ProcessEvents( DWORD mask ); +extern LRESULT ANDROID_DesktopWindowProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ); extern void ANDROID_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, - DWORD flags ) DECLSPEC_HIDDEN; -extern void ANDROID_SetParent( HWND hwnd, HWND parent, HWND old_parent ) DECLSPEC_HIDDEN; -extern void ANDROID_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) DECLSPEC_HIDDEN; -extern void ANDROID_SetCapture( HWND hwnd, UINT flags ) DECLSPEC_HIDDEN; -extern void ANDROID_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) DECLSPEC_HIDDEN; -extern UINT ANDROID_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) DECLSPEC_HIDDEN; + DWORD flags ); +extern void ANDROID_SetParent( HWND hwnd, HWND parent, HWND old_parent ); +extern void ANDROID_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ); +extern void ANDROID_SetCapture( HWND hwnd, UINT flags ); +extern void ANDROID_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ); +extern UINT ANDROID_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ); extern BOOL ANDROID_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, - const RECT *window_rect ) DECLSPEC_HIDDEN; -extern LRESULT ANDROID_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) DECLSPEC_HIDDEN; + const RECT *window_rect ); +extern LRESULT ANDROID_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ); extern BOOL ANDROID_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flags, const RECT *window_rect, const RECT *client_rect, - RECT *visible_rect, struct window_surface **surface ) DECLSPEC_HIDDEN; + RECT *visible_rect, struct window_surface **surface ); extern void ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, const RECT *window_rect, const RECT *client_rect, const RECT *visible_rect, const RECT *valid_rects, - struct window_surface *surface ) DECLSPEC_HIDDEN; + struct window_surface *surface ); /* unixlib interface */ -extern NTSTATUS android_dispatch_ioctl( void *arg ) DECLSPEC_HIDDEN; -extern NTSTATUS android_java_init( void *arg ) DECLSPEC_HIDDEN; -extern NTSTATUS android_java_uninit( void *arg ) DECLSPEC_HIDDEN; -extern NTSTATUS android_register_window( void *arg ) DECLSPEC_HIDDEN; +extern NTSTATUS android_dispatch_ioctl( void *arg ); +extern NTSTATUS android_java_init( void *arg ); +extern NTSTATUS android_java_uninit( void *arg ); +extern NTSTATUS android_register_window( void *arg ); extern PNTAPCFUNC register_window_callback; -extern unsigned int screen_width DECLSPEC_HIDDEN; -extern unsigned int screen_height DECLSPEC_HIDDEN; -extern RECT virtual_screen_rect DECLSPEC_HIDDEN; -extern MONITORINFOEXW default_monitor DECLSPEC_HIDDEN; +extern unsigned int screen_width; +extern unsigned int screen_height; +extern RECT virtual_screen_rect; +extern MONITORINFOEXW default_monitor; enum android_window_messages { WM_ANDROID_REFRESH = 0x80001000, }; -extern void init_gralloc( const struct hw_module_t *module ) DECLSPEC_HIDDEN; -extern HWND get_capture_window(void) DECLSPEC_HIDDEN; -extern void init_monitors( int width, int height ) DECLSPEC_HIDDEN; -extern void set_screen_dpi( DWORD dpi ) DECLSPEC_HIDDEN; -extern void update_keyboard_lock_state( WORD vkey, UINT state ) DECLSPEC_HIDDEN; +extern void init_gralloc( const struct hw_module_t *module ); +extern HWND get_capture_window(void); +extern void init_monitors( int width, int height ); +extern void set_screen_dpi( DWORD dpi ); +extern void update_keyboard_lock_state( WORD vkey, UINT state ); /* JNI entry points */ -extern void desktop_changed( JNIEnv *env, jobject obj, jint width, jint height ) DECLSPEC_HIDDEN; -extern void config_changed( JNIEnv *env, jobject obj, jint dpi ) DECLSPEC_HIDDEN; +extern void desktop_changed( JNIEnv *env, jobject obj, jint width, jint height ); +extern void config_changed( JNIEnv *env, jobject obj, jint dpi ); extern void surface_changed( JNIEnv *env, jobject obj, jint win, jobject surface, - jboolean client ) DECLSPEC_HIDDEN; + jboolean client ); extern jboolean motion_event( JNIEnv *env, jobject obj, jint win, jint action, - jint x, jint y, jint state, jint vscroll ) DECLSPEC_HIDDEN; + jint x, jint y, jint state, jint vscroll ); extern jboolean keyboard_event( JNIEnv *env, jobject obj, jint win, jint action, - jint keycode, jint state ) DECLSPEC_HIDDEN; + jint keycode, jint state ); enum event_type { @@ -191,7 +191,7 @@ union event_data } kbd; }; -int send_event( const union event_data *data ) DECLSPEC_HIDDEN; +int send_event( const union event_data *data ); extern JavaVM **p_java_vm; extern jobject *p_java_object;

1 0