June 2017 - Wine-Commits - list.winehq.org

Alexandre Julliard : wineandroid: Add a header for some of the Android native APIs and data structures.
by Alexandre Julliard June 2, 2017

June 2, 2017

Module: wine Branch: master Commit: 7124a7d90c0dc123da5a86229a7f64303bd32481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7124a7d90c0dc123da5a86229… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 2 11:46:21 2017 +0200 wineandroid: Add a header for some of the Android native APIs and data structures. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/android.h | 1 + dlls/wineandroid.drv/android_native.h | 233 ++++++++++++++++++++++++++++++++++ 2 files changed, 234 insertions(+) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index 70a1e04..fb8b67d 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -32,6 +32,7 @@ #include "wingdi.h" #include "winuser.h" #include "wine/gdi_driver.h" +#include "android_native.h" /************************************************************************** diff --git a/dlls/wineandroid.drv/android_native.h b/dlls/wineandroid.drv/android_native.h new file mode 100644 index 0000000..5efd564 --- /dev/null +++ b/dlls/wineandroid.drv/android_native.h @@ -0,0 +1,233 @@ +/* + * Android native system definitions + * + * Copyright 2013 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* Copy of some Android native structures to avoid depending on the Android source */ +/* Hopefully these won't change too frequently... */ + +#ifndef __WINE_ANDROID_NATIVE_H +#define __WINE_ANDROID_NATIVE_H + +/* Native window definitions */ + +typedef struct native_handle +{ + int version; + int numFds; + int numInts; + int data[0]; +} native_handle_t; + +typedef const native_handle_t *buffer_handle_t; + +struct android_native_base_t +{ + int magic; + int version; + void *reserved[4]; + void (*incRef)(struct android_native_base_t *base); + void (*decRef)(struct android_native_base_t *base); +}; + +typedef struct android_native_rect_t +{ + int32_t left; + int32_t top; + int32_t right; + int32_t bottom; +} android_native_rect_t; + +struct ANativeWindowBuffer +{ + struct android_native_base_t common; + int width; + int height; + int stride; + int format; + int usage; + void *reserved[2]; + buffer_handle_t handle; + void *reserved_proc[8]; +}; + +struct ANativeWindow +{ + struct android_native_base_t common; + uint32_t flags; + int minSwapInterval; + int maxSwapInterval; + float xdpi; + float ydpi; + intptr_t oem[4]; + int (*setSwapInterval)(struct ANativeWindow *window, int interval); + int (*dequeueBuffer_DEPRECATED)(struct ANativeWindow *window, struct ANativeWindowBuffer **buffer); + int (*lockBuffer_DEPRECATED)(struct ANativeWindow *window, struct ANativeWindowBuffer *buffer); + int (*queueBuffer_DEPRECATED)(struct ANativeWindow *window, struct ANativeWindowBuffer *buffer); + int (*query)(const struct ANativeWindow *window, int what, int *value); + int (*perform)(struct ANativeWindow *window, int operation, ... ); + int (*cancelBuffer_DEPRECATED)(struct ANativeWindow *window, struct ANativeWindowBuffer *buffer); + int (*dequeueBuffer)(struct ANativeWindow *window, struct ANativeWindowBuffer **buffer, int *fenceFd); + int (*queueBuffer)(struct ANativeWindow *window, struct ANativeWindowBuffer *buffer, int fenceFd); + int (*cancelBuffer)(struct ANativeWindow *window, struct ANativeWindowBuffer *buffer, int fenceFd); +}; + +enum native_window_query +{ + NATIVE_WINDOW_WIDTH = 0, + NATIVE_WINDOW_HEIGHT = 1, + NATIVE_WINDOW_FORMAT = 2, + NATIVE_WINDOW_MIN_UNDEQUEUED_BUFFERS = 3, + NATIVE_WINDOW_QUEUES_TO_WINDOW_COMPOSER = 4, + NATIVE_WINDOW_CONCRETE_TYPE = 5, + NATIVE_WINDOW_DEFAULT_WIDTH = 6, + NATIVE_WINDOW_DEFAULT_HEIGHT = 7, + NATIVE_WINDOW_TRANSFORM_HINT = 8, + NATIVE_WINDOW_CONSUMER_RUNNING_BEHIND = 9 +}; + +enum native_window_perform +{ + NATIVE_WINDOW_SET_USAGE = 0, + NATIVE_WINDOW_CONNECT = 1, + NATIVE_WINDOW_DISCONNECT = 2, + NATIVE_WINDOW_SET_CROP = 3, + NATIVE_WINDOW_SET_BUFFER_COUNT = 4, + NATIVE_WINDOW_SET_BUFFERS_GEOMETRY = 5, + NATIVE_WINDOW_SET_BUFFERS_TRANSFORM = 6, + NATIVE_WINDOW_SET_BUFFERS_TIMESTAMP = 7, + NATIVE_WINDOW_SET_BUFFERS_DIMENSIONS = 8, + NATIVE_WINDOW_SET_BUFFERS_FORMAT = 9, + NATIVE_WINDOW_SET_SCALING_MODE = 10, + NATIVE_WINDOW_LOCK = 11, + NATIVE_WINDOW_UNLOCK_AND_POST = 12, + NATIVE_WINDOW_API_CONNECT = 13, + NATIVE_WINDOW_API_DISCONNECT = 14, + NATIVE_WINDOW_SET_BUFFERS_USER_DIMENSIONS = 15, + NATIVE_WINDOW_SET_POST_TRANSFORM_CROP = 16 +}; + +enum native_window_api +{ + NATIVE_WINDOW_API_EGL = 1, + NATIVE_WINDOW_API_CPU = 2, + NATIVE_WINDOW_API_MEDIA = 3, + NATIVE_WINDOW_API_CAMERA = 4 +}; + +enum android_pixel_format +{ + PF_RGBA_8888 = 1, + PF_RGBX_8888 = 2, + PF_RGB_888 = 3, + PF_RGB_565 = 4, + PF_BGRA_8888 = 5, + PF_RGBA_5551 = 6, + PF_RGBA_4444 = 7 +}; + + +/* Hardware module definitions */ + +struct hw_module_methods_t; +struct hw_device_t; +struct android_ycbcr; + +struct hw_module_t +{ + uint32_t tag; + uint16_t module_api_version; + uint16_t hal_api_version; + const char *id; + const char *name; + const char *author; + struct hw_module_methods_t *methods; + void *dso; + void *reserved[32-7]; +}; + +struct hw_module_methods_t +{ + int (*open)(const struct hw_module_t *module, const char *id, struct hw_device_t **device); +}; + +struct hw_device_t +{ + uint32_t tag; + uint32_t version; + struct hw_module_t *module; + void *reserved[12]; + int (*close)(struct hw_device_t *device); +}; + +struct gralloc_module_t +{ + struct hw_module_t common; + int (*registerBuffer)(struct gralloc_module_t const *module, buffer_handle_t handle); + int (*unregisterBuffer)(struct gralloc_module_t const *module, buffer_handle_t handle); + int (*lock)(struct gralloc_module_t const *module, buffer_handle_t handle, int usage, int l, int t, int w, int h, void **vaddr); + int (*unlock)(struct gralloc_module_t const *module, buffer_handle_t handle); + int (*perform)(struct gralloc_module_t const *module, int operation, ... ); + int (*lock_ycbcr)(struct gralloc_module_t const *module, buffer_handle_t handle, int usage, int l, int t, int w, int h, struct android_ycbcr *ycbcr); + void *reserved_proc[6]; +}; + +#define ANDROID_NATIVE_MAKE_CONSTANT(a,b,c,d) \ + (((unsigned)(a)<<24)|((unsigned)(b)<<16)|((unsigned)(c)<<8)|(unsigned)(d)) + +#define ANDROID_NATIVE_WINDOW_MAGIC \ + ANDROID_NATIVE_MAKE_CONSTANT('_','w','n','d') + +#define ANDROID_NATIVE_BUFFER_MAGIC \ + ANDROID_NATIVE_MAKE_CONSTANT('_','b','f','r') + +enum gralloc_usage +{ + GRALLOC_USAGE_SW_READ_NEVER = 0x00000000, + GRALLOC_USAGE_SW_READ_RARELY = 0x00000002, + GRALLOC_USAGE_SW_READ_OFTEN = 0x00000003, + GRALLOC_USAGE_SW_READ_MASK = 0x0000000F, + GRALLOC_USAGE_SW_WRITE_NEVER = 0x00000000, + GRALLOC_USAGE_SW_WRITE_RARELY = 0x00000020, + GRALLOC_USAGE_SW_WRITE_OFTEN = 0x00000030, + GRALLOC_USAGE_SW_WRITE_MASK = 0x000000F0, + GRALLOC_USAGE_HW_TEXTURE = 0x00000100, + GRALLOC_USAGE_HW_RENDER = 0x00000200, + GRALLOC_USAGE_HW_2D = 0x00000400, + GRALLOC_USAGE_HW_COMPOSER = 0x00000800, + GRALLOC_USAGE_HW_FB = 0x00001000, + GRALLOC_USAGE_HW_VIDEO_ENCODER = 0x00010000, + GRALLOC_USAGE_HW_CAMERA_WRITE = 0x00020000, + GRALLOC_USAGE_HW_CAMERA_READ = 0x00040000, + GRALLOC_USAGE_HW_CAMERA_ZSL = 0x00060000, + GRALLOC_USAGE_HW_CAMERA_MASK = 0x00060000, + GRALLOC_USAGE_HW_MASK = 0x00071F00, + GRALLOC_USAGE_EXTERNAL_DISP = 0x00002000, + GRALLOC_USAGE_PROTECTED = 0x00004000, + GRALLOC_USAGE_PRIVATE_0 = 0x10000000, + GRALLOC_USAGE_PRIVATE_1 = 0x20000000, + GRALLOC_USAGE_PRIVATE_2 = 0x40000000, + GRALLOC_USAGE_PRIVATE_3 = 0x80000000, + GRALLOC_USAGE_PRIVATE_MASK = 0xF0000000, +}; + +#define GRALLOC_HARDWARE_MODULE_ID "gralloc" + +extern int hw_get_module(const char *id, const struct hw_module_t **module); + +#endif /* __WINE_ANDROID_NATIVE_H */

1 0

Alexandre Julliard : wineandroid: Add a JNI callback to store the native window we got from the TextureView.
by Alexandre Julliard June 2, 2017

June 2, 2017

Module: wine Branch: master Commit: 9a134711e6598081d5af55a3f02df625f669a036 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a134711e6598081d5af55a3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 2 11:37:16 2017 +0200 wineandroid: Add a JNI callback to store the native window we got from the TextureView. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 2 + dlls/wineandroid.drv/android.h | 14 +++++ dlls/wineandroid.drv/device.c | 95 ++++++++++++++++++++++++++++++++++ dlls/wineandroid.drv/init.c | 12 ++++- dlls/wineandroid.drv/window.c | 45 +++++++++++++++- 5 files changed, 166 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a134711e6598081d5af5…

1 0

Michael Müller : include: Fix definition of EXTERN_GUID.
by Alexandre Julliard June 2, 2017

June 2, 2017

Module: wine Branch: master Commit: 2aaeeb105e1fdb31fde859a5c6dc6ea103234067 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aaeeb105e1fdb31fde859a5c… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Jun 1 17:46:11 2017 +0300 include: Fix definition of EXTERN_GUID. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/rpcndr.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/rpcndr.h b/include/rpcndr.h index f795566..9029950 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -45,9 +45,7 @@ extern "C" { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } #else #define EXTERN_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - const GUID DECLSPEC_SELECTANY name DECLSPEC_HIDDEN; \ - const GUID DECLSPEC_SELECTANY name = \ - { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } + EXTERN_C const GUID name #endif #endif

1 0

Zebediah Figura : user32/tests: Add tests for minimizing MDI windows.
by Alexandre Julliard June 2, 2017

June 2, 2017

Module: wine Branch: master Commit: 84a2459d56b64c47f5753090e37e5163c8cbf807 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a2459d56b64c47f5753090e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 31 13:44:16 2017 -0500 user32/tests: Add tests for minimizing MDI windows. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index e146e96..460ae93 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1841,6 +1841,14 @@ static void test_MDI_child_stack(HWND mdi_client) "Broken MDI child stack:\nexpected: %p->%p->%p->%p, but got: %p->%p->%p->%p\n", child_4, child_2, child_1, child_3, stack[0], stack[1], stack[2], stack[3]); + trace("Minimize child %p\n", child_4); + ShowWindow(child_4, SW_MINIMIZE); + + stack[0] = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + stack[1] = GetWindow(stack[0], GW_HWNDNEXT); + todo_wine ok(stack[0] == child_4, "Expected %p, got %p\n", child_4, stack[0]); + todo_wine ok(stack[1] == NULL, "Expected NULL, got %p\n", stack[1]); + DestroyWindow(child_1); DestroyWindow(child_2); DestroyWindow(child_3);

1 0

Ken Thomases : server: On macOS, don't use clock_gettime() even if it' s available.
by Alexandre Julliard June 2, 2017

June 2, 2017

Module: wine Branch: master Commit: 1984e86b44343c8f1cdb163b8481ab84ca9cd16a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1984e86b44343c8f1cdb163b8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jun 1 14:48:06 2017 -0500 server: On macOS, don't use clock_gettime() even if it's available. The problem is building against the 10.12 or later SDK but deploying to 10.11 or earlier. Support for clock_gettime() is new with 10.12 so configure finds it and the code uses it, but the symbol is weak linked and resolves to NULL when running on earlier versions. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/request.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/server/request.c b/server/request.c index 781889c..6120bc5 100644 --- a/server/request.c +++ b/server/request.c @@ -518,7 +518,12 @@ int send_client_fd( struct process *process, int fd, obj_handle_t handle ) /* get current tick count to return to client */ unsigned int get_tick_count(void) { -#ifdef HAVE_CLOCK_GETTIME +#ifdef __APPLE__ + static mach_timebase_info_data_t timebase; + + if (!timebase.denom) mach_timebase_info( &timebase ); + return mach_absolute_time() * timebase.numer / timebase.denom / 1000000; +#elif defined(HAVE_CLOCK_GETTIME) struct timespec ts; #ifdef CLOCK_MONOTONIC_RAW if (!clock_gettime( CLOCK_MONOTONIC_RAW, &ts )) @@ -526,11 +531,6 @@ unsigned int get_tick_count(void) #endif if (!clock_gettime( CLOCK_MONOTONIC, &ts )) return ts.tv_sec * 1000 + ts.tv_nsec / 1000000; -#elif defined(__APPLE__) - static mach_timebase_info_data_t timebase; - - if (!timebase.denom) mach_timebase_info( &timebase ); - return mach_absolute_time() * timebase.numer / timebase.denom / 1000000; #endif return (current_time - server_start_time) / 10000; }

1 0

Alexandre Julliard : wineandroid: Create a TextureView for every top-level window.
by Alexandre Julliard June 2, 2017

June 2, 2017

Module: wine Branch: master Commit: 2645cc2a7f65b962f47d25327ab0f96506c6b8d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2645cc2a7f65b962f47d25327… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 2 11:35:12 2017 +0200 wineandroid: Create a TextureView for every top-level window. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 71 ++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 28523a1..2eca5fc 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -25,10 +25,13 @@ import android.app.ProgressDialog; import android.content.Context; import android.content.SharedPreferences; import android.graphics.Rect; +import android.graphics.SurfaceTexture; import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.util.Log; +import android.view.Surface; +import android.view.TextureView; import android.view.View; import android.view.ViewGroup; import java.io.BufferedReader; @@ -286,6 +289,9 @@ public class WineActivity extends Activity protected boolean visible; protected Rect visible_rect; protected Rect client_rect; + protected WineWindow parent; + protected WineView window_view; + protected Surface window_surface; public WineWindow( int w, WineWindow parent ) { @@ -295,7 +301,13 @@ public class WineActivity extends Activity style = 0; visible = false; visible_rect = client_rect = new Rect( 0, 0, 0, 0 ); + this.parent = parent; win_map.put( w, this ); + if (parent == null) + { + window_view = new WineView( WineActivity.this, this ); + window_view.layout( 0, 0, 1, 1 ); // make sure the surface gets created + } } public void destroy() @@ -315,6 +327,12 @@ public class WineActivity extends Activity Log.i( LOGTAG, String.format( "pos changed hwnd %08x after %08x owner %08x style %08x win %s client %s visible %s flags %08x", hwnd, insert_after, owner, style, window_rect, client_rect, visible_rect, flags )); + if (parent == null) + { + window_view.layout( visible_rect.left, visible_rect.top, visible_rect.right, visible_rect.bottom ); + if (!visible && (style & WS_VISIBLE) != 0) top_view.addView( window_view ); + else if (visible && (style & WS_VISIBLE) == 0) top_view.removeView( window_view ); + } visible = (style & WS_VISIBLE) != 0; } @@ -322,6 +340,59 @@ public class WineActivity extends Activity { return hwnd; } + + public void set_surface( SurfaceTexture surftex ) + { + if (surftex == null) window_surface = null; + else if (window_surface == null) window_surface = new Surface( surftex ); + Log.i( LOGTAG, String.format( "set window surface hwnd %08x %s", hwnd, window_surface )); + } + } + + // View used for all Wine windows, backed by a TextureView + + protected class WineView extends TextureView implements TextureView.SurfaceTextureListener + { + private WineWindow window; + + public WineView( Context c, WineWindow win ) + { + super( c ); + window = win; + setSurfaceTextureListener( this ); + setVisibility( VISIBLE ); + setOpaque( false ); + } + + public WineWindow get_window() + { + return window; + } + + public void onSurfaceTextureAvailable( SurfaceTexture surftex, int width, int height ) + { + Log.i( LOGTAG, String.format( "onSurfaceTextureAvailable win %08x %dx%d", + window.hwnd, width, height )); + window.set_surface( surftex ); + } + + public void onSurfaceTextureSizeChanged( SurfaceTexture surftex, int width, int height ) + { + Log.i( LOGTAG, String.format( "onSurfaceTextureSizeChanged win %08x %dx%d", + window.hwnd, width, height )); + window.set_surface( surftex ); + } + + public boolean onSurfaceTextureDestroyed( SurfaceTexture surftex ) + { + Log.i( LOGTAG, String.format( "onSurfaceTextureDestroyed win %08x", window.hwnd )); + window.set_surface( null ); + return true; + } + + public void onSurfaceTextureUpdated(SurfaceTexture surftex) + { + } } // The top-level desktop view group

1 0

Alexandre Julliard : wineandroid: Add a Java callback for setting window position.
by Alexandre Julliard June 2, 2017

June 2, 2017

Module: wine Branch: master Commit: 97005de15123f6ef1980fec91e359d87055f10a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97005de15123f6ef1980fec91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 2 11:34:23 2017 +0200 wineandroid: Add a Java callback for setting window position. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 51 ++++++++++++++++++++++++++++++++ dlls/wineandroid.drv/android.h | 3 ++ dlls/wineandroid.drv/device.c | 53 ++++++++++++++++++++++++++++++++++ dlls/wineandroid.drv/window.c | 12 ++++++-- 4 files changed, 117 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=97005de15123f6ef1980f…

1 0

Zebediah Figura : msacm32: Don' t write cbSize if the format is WAVE_FORMAT_PCM.
by Alexandre Julliard June 2, 2017

June 2, 2017

Module: wine Branch: master Commit: 4e0c3707c3af8019db2c41ed6287bdde6e0b6fd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e0c3707c3af8019db2c41ed6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 1 14:16:43 2017 -0500 msacm32: Don't write cbSize if the format is WAVE_FORMAT_PCM. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/format.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index de07cba..3f3ee54 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -78,7 +78,8 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, afd.pwfx = HeapAlloc(MSACM_hHeap, 0, paftd->cbFormatSize); if (!afd.pwfx) return FALSE; afd.pwfx->wFormatTag = paftd->dwFormatTag; - afd.pwfx->cbSize = paftd->cbFormatSize; + if (paftd->dwFormatTag != WAVE_FORMAT_PCM) + afd.pwfx->cbSize = paftd->cbFormatSize - sizeof(WAVEFORMATEX); afd.cbwfx = paftd->cbFormatSize; for (i = 0; i < paftd->cStandardFormats; i++) {

1 0

Hugh McMaster : regedit: Update handling of the new subkey and new value menu items.
by Alexandre Julliard June 1, 2017

June 1, 2017

Module: wine Branch: master Commit: 6c752aaf8da225365b2bdbbf3c43d41afd4d1344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c752aaf8da225365b2bdbbf3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 1 09:33:29 2017 +0000 regedit: Update handling of the new subkey and new value menu items. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 6930d7a..c46dee3 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -154,14 +154,18 @@ static void update_delete_and_rename_items(HMENU hMenu, WCHAR *keyName) EnableMenuItem(hMenu, ID_EDIT_RENAME, state_r | MF_BYCOMMAND); } -static void update_copy_keyname_item(HMENU hMenu, WCHAR *keyName) +static void update_new_items_and_copy_keyname(HMENU hMenu, WCHAR *keyName) { - unsigned int state = MF_ENABLED; + unsigned int state = MF_ENABLED, i; + unsigned int items[] = {ID_EDIT_NEW_KEY, ID_EDIT_NEW_STRINGVALUE, ID_EDIT_NEW_BINARYVALUE, + ID_EDIT_NEW_DWORDVALUE, ID_EDIT_NEW_MULTI_STRINGVALUE, + ID_EDIT_NEW_EXPANDVALUE, ID_EDIT_COPYKEYNAME}; if (!keyName) state = MF_GRAYED; - EnableMenuItem(hMenu, ID_EDIT_COPYKEYNAME, state | MF_BYCOMMAND); + for (i = 0; i < COUNT_OF(items); i++) + EnableMenuItem(hMenu, items[i], state | MF_BYCOMMAND); } static void UpdateMenuItems(HMENU hMenu) { @@ -180,7 +184,7 @@ static void UpdateMenuItems(HMENU hMenu) { update_expand_or_collapse_item(hwndTV, selection, hMenu); EnableMenuItem(hMenu, ID_EDIT_MODIFY, (bAllowEdit ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); update_delete_and_rename_items(hMenu, keyName); - update_copy_keyname_item(hMenu, keyName); + update_new_items_and_copy_keyname(hMenu, keyName); EnableMenuItem(hMenu, ID_FAVORITES_ADDTOFAVORITES, (hRootKey ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); EnableMenuItem(hMenu, ID_FAVORITES_REMOVEFAVORITE, (GetMenuItemCount(hMenu)>2 ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND);

1 0

Hugh McMaster : regedit: Update some resource strings.
by Alexandre Julliard June 1, 2017

June 1, 2017

Module: wine Branch: master Commit: 576d300e497ef19410110a2016bf08e58fec533e URL: http://source.winehq.org/git/wine.git/?a=commit;h=576d300e497ef19410110a201… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 1 09:33:19 2017 +0000 regedit: Update some resource strings. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 34 ++++++++++++++++++++++++++-------- po/bg.po | 32 ++++++++++++++++++++++++-------- po/ca.po | 34 ++++++++++++++++++++++++++-------- po/cs.po | 34 ++++++++++++++++++++++++++-------- po/da.po | 34 ++++++++++++++++++++++++++-------- po/de.po | 34 ++++++++++++++++++++++++++-------- po/el.po | 18 +++++++++++------- po/en.po | 28 ++++++++++++++++------------ po/en_US.po | 28 ++++++++++++++++------------ po/eo.po | 34 ++++++++++++++++++++++++++-------- po/es.po | 34 ++++++++++++++++++++++++++-------- po/fa.po | 18 +++++++++++------- po/fi.po | 34 ++++++++++++++++++++++++++-------- po/fr.po | 34 ++++++++++++++++++++++++++-------- po/he.po | 34 ++++++++++++++++++++++++++-------- po/hi.po | 18 +++++++++++------- po/hr.po | 22 ++++++++++++++-------- po/hu.po | 34 ++++++++++++++++++++++++++-------- po/it.po | 34 ++++++++++++++++++++++++++-------- po/ja.po | 34 ++++++++++++++++++++++++++-------- po/ko.po | 34 ++++++++++++++++++++++++++-------- po/lt.po | 34 ++++++++++++++++++++++++++-------- po/ml.po | 18 +++++++++++------- po/nb_NO.po | 34 ++++++++++++++++++++++++++-------- po/nl.po | 34 ++++++++++++++++++++++++++-------- po/or.po | 18 +++++++++++------- po/pa.po | 18 +++++++++++------- po/pl.po | 34 ++++++++++++++++++++++++++-------- po/pt_BR.po | 34 ++++++++++++++++++++++++++-------- po/pt_PT.po | 34 ++++++++++++++++++++++++++-------- po/rm.po | 18 +++++++++++------- po/ro.po | 34 ++++++++++++++++++++++++++-------- po/ru.po | 34 ++++++++++++++++++++++++++-------- po/sk.po | 30 +++++++++++++++++++++--------- po/sl.po | 34 ++++++++++++++++++++++++++-------- po/sr_RS(a)cyrillic.po | 18 +++++++++++------- po/sr_RS(a)latin.po | 18 +++++++++++------- po/sv.po | 34 ++++++++++++++++++++++++++-------- po/te.po | 18 +++++++++++------- po/th.po | 18 +++++++++++------- po/tr.po | 34 ++++++++++++++++++++++++++-------- po/uk.po | 34 ++++++++++++++++++++++++++-------- po/wa.po | 18 +++++++++++------- po/wine.pot | 18 +++++++++++------- po/zh_CN.po | 34 ++++++++++++++++++++++++++-------- po/zh_TW.po | 34 ++++++++++++++++++++++++++-------- programs/regedit/regedit.rc | 14 +++++++------- 47 files changed, 969 insertions(+), 371 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=576d300e497ef19410110…

1 0