March 2016 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Get resource info from the texture in surface_private_setup().
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: fcbe8b7a791805435dd7906d054b1dcf03dc9ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcbe8b7a791805435dd7906d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 14 17:02:13 2016 +0100 wined3d: Get resource info from the texture in surface_private_setup(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 090bbb1..99a2649 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -534,7 +534,8 @@ static BOOL surface_use_pbo(const struct wined3d_surface *surface) static HRESULT surface_private_setup(struct wined3d_surface *surface) { /* TODO: Check against the maximum texture sizes supported by the video card. */ - const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; + struct wined3d_texture *texture = surface->container; + const struct wined3d_gl_info *gl_info = &texture->resource.device->adapter->gl_info; unsigned int pow2Width, pow2Height; TRACE("surface %p.\n", surface); @@ -561,7 +562,7 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) if (pow2Width > surface->resource.width || pow2Height > surface->resource.height) { /* TODO: Add support for non power two compressed textures. */ - if (surface->container->resource.format_flags & (WINED3DFMT_FLAG_COMPRESSED | WINED3DFMT_FLAG_HEIGHT_SCALE)) + if (texture->resource.format_flags & (WINED3DFMT_FLAG_COMPRESSED | WINED3DFMT_FLAG_HEIGHT_SCALE)) { FIXME("(%p) Compressed or height scaled non-power-two textures are not supported w(%d) h(%d)\n", surface, surface->resource.width, surface->resource.height); @@ -570,7 +571,7 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) } if ((surface->pow2Width > gl_info->limits.texture_size || surface->pow2Height > gl_info->limits.texture_size) - && !(surface->resource.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL))) + && !(texture->resource.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL))) { /* One of three options: * 1: Do the same as we do with NPOT and scale the texture, (any @@ -582,7 +583,7 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) * Blts. Some apps (e.g. Swat 3) create textures with a Height of * 16 and a Width > 3000 and blt 16x16 letter areas from them to * the render target. */ - if (surface->resource.pool == WINED3D_POOL_DEFAULT || surface->resource.pool == WINED3D_POOL_MANAGED) + if (texture->resource.pool == WINED3D_POOL_DEFAULT || texture->resource.pool == WINED3D_POOL_MANAGED) { WARN("Unable to allocate a surface which exceeds the maximum OpenGL texture size.\n"); return WINED3DERR_NOTAVAILABLE; @@ -593,7 +594,7 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) surface->pow2Width, surface->pow2Height); } - if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) surface->locations = WINED3D_LOCATION_DISCARDED; if (surface_use_pbo(surface))

1 0

Hugh McMaster : reg: Correctly handle cases with no data argument.
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: 84eed4cf222d179855a4f0efbaf6ebfad2cc6d1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=84eed4cf222d179855a4f0efb… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Mar 15 19:58:56 2016 +1100 reg: Correctly handle cases with no data argument. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 7 +++++-- programs/reg/tests/reg.c | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 164981d..1167ccb 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -225,11 +225,14 @@ static inline BYTE hexchar_to_byte(WCHAR ch) return -1; } -static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *reg_count) +static LPBYTE get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DWORD *reg_count) { + static const WCHAR empty; LPBYTE out_data = NULL; *reg_count = 0; + if (!data) data = ∅ + switch (reg_type) { case REG_NONE: @@ -411,7 +414,7 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, return 1; } - if (data && !(reg_data = get_regdata(data, reg_type, separator, &reg_count))) + if (!(reg_data = get_regdata(data, reg_type, separator, &reg_count))) { RegCloseKey(subkey); return 1; diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 4089367..6a55537 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -147,11 +147,11 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v none1 /t REG_NONE /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, "none1", REG_NONE, "\0", 2, TODO_REG_SIZE); + verify_reg(hkey, "none1", REG_NONE, "\0", 2, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_NONE /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, NULL, REG_NONE, "\0", 2, TODO_REG_SIZE); + verify_reg(hkey, NULL, REG_NONE, "\0", 2, 0); /* REG_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /d WineTest /f", &r); @@ -168,7 +168,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v test /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg(hkey, "test", REG_SZ, "", 1, TODO_REG_SIZE); + verify_reg(hkey, "test", REG_SZ, "", 1, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /v test1 /t REG_SZ /f /d", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -179,7 +179,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_SZ /v test2 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg(hkey, "test2", REG_SZ, "", 1, TODO_REG_SIZE); + verify_reg(hkey, "test2", REG_SZ, "", 1, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_SZ /v test3 /f /d \"\"", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -187,11 +187,11 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, NULL, REG_SZ, "", 1, TODO_REG_SIZE); + verify_reg(hkey, NULL, REG_SZ, "", 1, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_SZ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, NULL, REG_SZ, "", 1, TODO_REG_SIZE); + verify_reg(hkey, NULL, REG_SZ, "", 1, 0); /* REG_EXPAND_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v expand0 /t REG_EXpand_sz /d \"dead%PATH%beef\" /f", &r); @@ -204,7 +204,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_EXPAND_SZ /v expand2 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "expand2", REG_EXPAND_SZ, "", 1, TODO_REG_SIZE); + verify_reg(hkey, "expand2", REG_EXPAND_SZ, "", 1, 0); run_reg_exe("reg add HKEY_CURRENT_USER\\" KEY_BASE " /ve /t REG_EXPAND_SZ /d WineTEST /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); @@ -216,7 +216,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_EXPAND_SZ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, NULL, REG_EXPAND_SZ, "", 1, TODO_REG_SIZE); + verify_reg(hkey, NULL, REG_EXPAND_SZ, "", 1, 0); /* REG_BINARY */ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin0 /f", &r); @@ -372,7 +372,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi3 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "multi3", REG_MULTI_SZ, &buffer[21], 1, TODO_REG_SIZE); + verify_reg(hkey, "multi3", REG_MULTI_SZ, &buffer[21], 1, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi4 /s \"#\" /d \"threelittlestrings\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); @@ -435,7 +435,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_MULTI_SZ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, NULL, REG_MULTI_SZ, buffer, 1, TODO_REG_SIZE); + verify_reg(hkey, NULL, REG_MULTI_SZ, buffer, 1, 0); RegCloseKey(hkey);

1 0

Henri Verbeet : wined3d: Get resource info from the texture in wined3d_surface_cleanup().
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: 724463d66661558bfb9f99931b2c17d129b7ad63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=724463d66661558bfb9f99931… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 14 17:02:11 2016 +0100 wined3d: Get resource info from the texture in wined3d_surface_cleanup(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 574069b..a19098f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -53,10 +53,10 @@ void wined3d_surface_cleanup(struct wined3d_surface *surface) if (surface->rb_multisample || surface->rb_resolved || !list_empty(&surface->renderbuffers)) { + struct wined3d_device *device = surface->container->resource.device; struct wined3d_renderbuffer_entry *entry, *entry2; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; - struct wined3d_device *device = surface->resource.device; context = context_acquire(device, NULL); gl_info = context->gl_info;

1 0

Łukasz Wojniłowicz : Polish translation for release 1.9.5
by Jeremy Newman March 14, 2016

March 14, 2016

Module: website Branch: master Commit: 1b2551c4c84d5f16c1c359be12ee7f894b1ec6c4 URL: http://source.winehq.org/git/website.git/?a=commit;h=1b2551c4c84d5f16c1c359… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Mar 13 17:16:41 2016 +0100 Polish translation for release 1.9.5 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016030501.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2016030501.xml b/news/pl/2016030501.xml new file mode 100644 index 0000000..33e9630 --- /dev/null +++ b/news/pl/2016030501.xml @@ -0,0 +1,16 @@ +<news> +<date>Marzec 5, 2016</date> +<title>Wydano Wine 1.9.5</title> +<body> + Wydanie rozwojowe Wine 1.9.5 jest już dostępne. + <a href="{$root}/announce/1.9.5">Co nowego</a> w tym wydaniu: +<ul> + <li>Nowa wersja silnika Mono, ze 64-bitowym wsparciem.</li> + <li>Początki strumienia poleceń WineD3D.</li> + <li>Wsparcie dla stanów efektów w Direct3DX.</li> + <li>Ulepszenia w przeciąganiu i upuszczaniu.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.5.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexandre Julliard : libwine: Don' t include backwards compatibility functions on Android.
by Alexandre Julliard March 14, 2016

March 14, 2016

Module: wine Branch: master Commit: 877a4a733f26c724c919c9ba49d68e97e9e969d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=877a4a733f26c724c919c9ba4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 14 19:28:51 2016 +0900 libwine: Don't include backwards compatibility functions on Android. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/port.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index e05e166..d5ce07a 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -28,7 +28,9 @@ #include "wine/unicode.h" #include "wine/library.h" -/* functions from libwine_port that are also exported from libwine for backwards compatibility */ +/* functions from libwine_port that are also exported from libwine for backwards compatibility, + * on platforms that require it */ +#ifndef __ANDROID__ const void *libwine_port_functions[] = { wine_cp_enum_table, @@ -41,6 +43,7 @@ const void *libwine_port_functions[] = wine_utf8_mbstowcs, wine_utf8_wcstombs }; +#endif /* no longer used, for backwards compatibility only */ struct wine_pthread_functions;

1 0

Michael Stefaniuc : d3drm: Use debugstr_a to print a string that can be NULL.
by Alexandre Julliard March 14, 2016

March 14, 2016

Module: wine Branch: master Commit: 62277fb7779f76341efc71999d59242055be5c31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62277fb7779f76341efc71999… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 14 11:54:50 2016 +0100 d3drm: Use debugstr_a to print a string that can be NULL. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/meshbuilder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 8bd5131..6d0b55b 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1069,7 +1069,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, return hr; } - TRACE("Mesh name is '%s'\n", This->name ? This->name : ""); + TRACE("Mesh name is %s\n", debugstr_a(This->name)); This->nb_normals = 0;

1 0

Józef Kucia : d3d11/tests: Trace feature level.
by Alexandre Julliard March 14, 2016

March 14, 2016

Module: wine Branch: master Commit: 37954777d5d7c92ae7860ecd00bd76f19609f37a URL: http://source.winehq.org/git/wine.git/?a=commit;h=37954777d5d7c92ae7860ecd0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 14 00:03:09 2016 +0100 d3d11/tests: Trace feature level. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2238380..65173f3 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -438,6 +438,7 @@ static void test_create_device(void) } supported_feature_level = ID3D11Device_GetFeatureLevel(device); + trace("Feature level %#x.\n", supported_feature_level); ID3D11Device_Release(device); hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, NULL, NULL, NULL);

1 0

Michael Stefaniuc : winex11: Use debugstr_a to print strings that can be NULL.
by Alexandre Julliard March 14, 2016

March 14, 2016

Module: wine Branch: master Commit: 17169816cde37e1624892fc464edd190bdecb767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17169816cde37e1624892fc46… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 14 10:38:02 2016 +0100 winex11: Use debugstr_a to print strings that can be NULL. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/wintab.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 3642a47..bb3fcb8 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -565,7 +565,7 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) WTI_CURSORS_INFO cursor; TRACE("Device %i: [id %d|name %s|type %s|num_classes %d|use %d]\n", - loop, (int) devices[loop].id, devices[loop].name, device_type ? device_type : "", + loop, (int) devices[loop].id, devices[loop].name, debugstr_a(device_type), devices[loop].num_classes, devices[loop].use ); switch (devices[loop].use) @@ -620,7 +620,7 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) if (! is_tablet_cursor(target->name, device_type)) { WARN("Skipping device %d [name %s|type %s]; not apparently a tablet cursor type device. If this is wrong, please report it to wine-devel(a)winehq.org\n", - loop, devices[loop].name, device_type ? device_type : ""); + loop, devices[loop].name, debugstr_a(device_type)); break; }

1 0

Jacek Caban : kernel32: Don' t set unconditionally SECTION_QUERY flag in OpenFileMapping.
by Alexandre Julliard March 14, 2016

March 14, 2016

Module: wine Branch: master Commit: e625e86ee126b923703ad3ca728acff09f1e8812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e625e86ee126b923703ad3ca7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 11 15:43:42 2016 +0100 kernel32: Don't set unconditionally SECTION_QUERY flag in OpenFileMapping. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 32 ++++++++++++++++++++++++++++++-- dlls/kernel32/virtual.c | 1 - 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 8b86d45..775e708 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5560,17 +5560,23 @@ static void test_filemap_security(void) char temp_path[MAX_PATH]; char file_name[MAX_PATH]; DWORD ret, i, access; - HANDLE file, mapping, dup; + HANDLE file, mapping, dup, created_mapping; static const struct { int generic, mapped; + BOOL open_only; } map[] = { { 0, 0 }, { GENERIC_READ, STANDARD_RIGHTS_READ | SECTION_QUERY | SECTION_MAP_READ }, { GENERIC_WRITE, STANDARD_RIGHTS_WRITE | SECTION_MAP_WRITE }, { GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SECTION_MAP_EXECUTE }, - { GENERIC_ALL, STANDARD_RIGHTS_REQUIRED | SECTION_ALL_ACCESS } + { GENERIC_ALL, STANDARD_RIGHTS_REQUIRED | SECTION_ALL_ACCESS }, + { SECTION_MAP_READ | SECTION_MAP_WRITE, SECTION_MAP_READ | SECTION_MAP_WRITE }, + { SECTION_MAP_WRITE, SECTION_MAP_WRITE }, + { SECTION_MAP_READ | SECTION_QUERY, SECTION_MAP_READ | SECTION_QUERY }, + { SECTION_QUERY, SECTION_MAP_READ, TRUE }, + { SECTION_QUERY | SECTION_MAP_READ, SECTION_QUERY | SECTION_MAP_READ } }; static const struct { @@ -5599,6 +5605,8 @@ static void test_filemap_security(void) for (i = 0; i < sizeof(prot_map)/sizeof(prot_map[0]); i++) { + if (map[i].open_only) continue; + SetLastError(0xdeadbeef); mapping = CreateFileMappingW(file, NULL, prot_map[i].prot, 0, 4096, NULL); if (prot_map[i].mapped) @@ -5645,6 +5653,8 @@ static void test_filemap_security(void) for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) { + if (map[i].open_only) continue; + SetLastError( 0xdeadbeef ); ret = DuplicateHandle(GetCurrentProcess(), mapping, GetCurrentProcess(), &dup, map[i].generic, FALSE, 0); @@ -5659,6 +5669,24 @@ static void test_filemap_security(void) CloseHandle(mapping); CloseHandle(file); DeleteFileA(file_name); + + created_mapping = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 0x1000, + "Wine Test Open Mapping"); + ok(created_mapping != NULL, "CreateFileMapping failed with error %u\n", GetLastError()); + + for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) + { + if (!map[i].generic) continue; + + mapping = OpenFileMappingA(map[i].generic, FALSE, "Wine Test Open Mapping"); + ok(mapping != NULL, "OpenFileMapping failed with error %d\n", GetLastError()); + access = get_obj_access(mapping); + ok(access == map[i].mapped, "%d: unexpected access flags %#x, expected %#x\n", + i, access, map[i].mapped); + CloseHandle(mapping); + } + + CloseHandle(created_mapping); } static void test_thread_security(void) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index cce707b..32f2d65 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -472,7 +472,6 @@ HANDLE WINAPI OpenFileMappingW( DWORD access, BOOL inherit, LPCWSTR name) RtlInitUnicodeString( &nameW, name ); if (access == FILE_MAP_COPY) access = SECTION_MAP_READ; - access |= SECTION_QUERY; if (GetVersion() & 0x80000000) {

1 0

Austin English : api-ms-win-core-version-l1-1-0: Add dll.
by Alexandre Julliard March 14, 2016

March 14, 2016

Module: wine Branch: master Commit: 4b02c8bdbc5e55c3e9d3ce96c77ed5a0d0e752ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b02c8bdbc5e55c3e9d3ce96c… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 7 11:54:51 2016 -0600 api-ms-win-core-version-l1-1-0: Add dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-version-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-version-l1-1-0.spec | 4 ++++ tools/make_specfiles | 1 + 5 files changed, 9 insertions(+) diff --git a/configure b/configure index 1459255..f19429a 100755 --- a/configure +++ b/configure @@ -935,6 +935,7 @@ enable_api_ms_win_core_threadpool_legacy_l1_1_0 enable_api_ms_win_core_timezone_l1_1_0 enable_api_ms_win_core_url_l1_1_0 enable_api_ms_win_core_util_l1_1_0 +enable_api_ms_win_core_version_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_1 enable_api_ms_win_core_winrt_l1_1_0 @@ -17376,6 +17377,7 @@ wine_fn_config_dll api-ms-win-core-threadpool-legacy-l1-1-0 enable_api_ms_win_co wine_fn_config_dll api-ms-win-core-timezone-l1-1-0 enable_api_ms_win_core_timezone_l1_1_0 wine_fn_config_dll api-ms-win-core-url-l1-1-0 enable_api_ms_win_core_url_l1_1_0 wine_fn_config_dll api-ms-win-core-util-l1-1-0 enable_api_ms_win_core_util_l1_1_0 +wine_fn_config_dll api-ms-win-core-version-l1-1-0 enable_api_ms_win_core_version_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-1 enable_api_ms_win_core_winrt_error_l1_1_1 wine_fn_config_dll api-ms-win-core-winrt-l1-1-0 enable_api_ms_win_core_winrt_l1_1_0 diff --git a/configure.ac b/configure.ac index 3172c20..8cbf9e1 100644 --- a/configure.ac +++ b/configure.ac @@ -2687,6 +2687,7 @@ WINE_CONFIG_DLL(api-ms-win-core-threadpool-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-timezone-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-url-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-util-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-version-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-winrt-l1-1-0) diff --git a/dlls/api-ms-win-core-version-l1-1-0/Makefile.in b/dlls/api-ms-win-core-version-l1-1-0/Makefile.in new file mode 100644 index 0000000..c88fcab --- /dev/null +++ b/dlls/api-ms-win-core-version-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-version-l1-1-0.dll diff --git a/dlls/api-ms-win-core-version-l1-1-0/api-ms-win-core-version-l1-1-0.spec b/dlls/api-ms-win-core-version-l1-1-0/api-ms-win-core-version-l1-1-0.spec new file mode 100644 index 0000000..0ac1e13 --- /dev/null +++ b/dlls/api-ms-win-core-version-l1-1-0/api-ms-win-core-version-l1-1-0.spec @@ -0,0 +1,4 @@ +@ stdcall GetFileVersionInfoExW(long wstr long long ptr) version.GetFileVersionInfoExW +@ stdcall GetFileVersionInfoSizeExW(long wstr ptr) version.GetFileVersionInfoSizeExW +@ stdcall VerFindFileW(long wstr wstr wstr ptr ptr ptr ptr) version.VerFindFileW +@ stdcall VerQueryValueW(ptr wstr ptr ptr) version.VerQueryValueW diff --git a/tools/make_specfiles b/tools/make_specfiles index 442d22f..69c68ff 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -254,6 +254,7 @@ my @dll_groups = ], [ "version", + "api-ms-win-core-version-l1-1-0", "api-ms-win-downlevel-version-l1-1-0", ], [

1 0