November 2015 - Wine-Commits

Matteo Bruni : ddraw/tests: Port test_shademode() to ddraw7.
by Alexandre Julliard Nov. 13, 2015

Nov. 13, 2015

Module: wine Branch: master Commit: 1a3d6ad24074a98f357ba587f44a159afcb6df94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a3d6ad24074a98f357ba587f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 12 23:06:46 2015 +0100 ddraw/tests: Port test_shademode() to ddraw7. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 137 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index fe02396..24e7fc8 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -10158,6 +10158,142 @@ static void test_range_colorkey(void) DestroyWindow(window); } +static void test_shademode(void) +{ + IDirect3DVertexBuffer7 *vb_strip, *vb_list, *buffer; + IDirect3DDevice7 *device; + D3DVERTEXBUFFERDESC desc; + IDirectDrawSurface7 *rt; + DWORD color0, color1; + void *data = NULL; + IDirect3D7 *d3d; + ULONG refcount; + UINT i, count; + HWND window; + HRESULT hr; + static const struct + { + struct vec3 position; + DWORD diffuse; + } + quad_strip[] = + { + {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, + {{ 1.0f, 1.0f, 0.0f}, 0xffffffff}, + }, + quad_list[] = + { + {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, + + {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, + {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, 1.0f, 0.0f}, 0xffffffff}, + }; + static const struct + { + DWORD primtype; + DWORD shademode; + DWORD color0, color1; + } + tests[] = + { + {D3DPT_TRIANGLESTRIP, D3DSHADE_FLAT, 0x00ff0000, 0x0000ff00}, + {D3DPT_TRIANGLESTRIP, D3DSHADE_PHONG, 0x000dca28, 0x000d45c7}, + {D3DPT_TRIANGLESTRIP, D3DSHADE_GOURAUD, 0x000dca28, 0x000d45c7}, + {D3DPT_TRIANGLESTRIP, D3DSHADE_PHONG, 0x000dca28, 0x000d45c7}, + {D3DPT_TRIANGLELIST, D3DSHADE_FLAT, 0x00ff0000, 0x000000ff}, + {D3DPT_TRIANGLELIST, D3DSHADE_GOURAUD, 0x000dca28, 0x000d45c7}, + }; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice7_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); + hr = IDirect3DDevice7_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(hr == D3D_OK, "Failed to disable lighting, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwCaps = D3DVBCAPS_WRITEONLY; + desc.dwFVF = D3DFVF_XYZ | D3DFVF_DIFFUSE; + desc.dwNumVertices = sizeof(quad_strip) / sizeof(*quad_strip); + hr = IDirect3D7_CreateVertexBuffer(d3d, &desc, &vb_strip, 0); + ok(hr == D3D_OK, "Failed to create vertex buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer7_Lock(vb_strip, 0, &data, NULL); + ok(hr == D3D_OK, "Failed to lock vertex buffer, hr %#x.\n", hr); + memcpy(data, quad_strip, sizeof(quad_strip)); + hr = IDirect3DVertexBuffer7_Unlock(vb_strip); + ok(hr == D3D_OK, "Failed to unlock vertex buffer, hr %#x.\n", hr); + + desc.dwNumVertices = sizeof(quad_list) / sizeof(*quad_list); + hr = IDirect3D7_CreateVertexBuffer(d3d, &desc, &vb_list, 0); + ok(hr == D3D_OK, "Failed to create vertex buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer7_Lock(vb_list, 0, &data, NULL); + ok(hr == D3D_OK, "Failed to lock vertex buffer, hr %#x.\n", hr); + memcpy(data, quad_list, sizeof(quad_list)); + hr = IDirect3DVertexBuffer7_Unlock(vb_list); + ok(hr == D3D_OK, "Failed to unlock vertex buffer, hr %#x.\n", hr); + + /* Try it first with a TRIANGLESTRIP. Do it with different geometry because + * the color fixups we have to do for FLAT shading will be dependent on that. */ + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + { + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_SHADEMODE, tests[i].shademode); + ok(hr == D3D_OK, "Failed to set shade mode, hr %#x.\n", hr); + + hr = IDirect3DDevice7_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + buffer = tests[i].primtype == D3DPT_TRIANGLESTRIP ? vb_strip : vb_list; + count = tests[i].primtype == D3DPT_TRIANGLESTRIP ? 4 : 6; + hr = IDirect3DDevice7_DrawPrimitiveVB(device, tests[i].primtype, buffer, 0, count, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color0 = get_surface_color(rt, 100, 100); /* Inside first triangle */ + color1 = get_surface_color(rt, 500, 350); /* Inside second triangle */ + + /* For D3DSHADE_FLAT it should take the color of the first vertex of + * each triangle. This requires EXT_provoking_vertex or similar + * functionality being available. */ + /* PHONG should be the same as GOURAUD, since no hardware implements + * this. */ + ok(color0 == tests[i].color0, "Test %u shading has color0 %08x, expected %08x.\n", + i, color0, tests[i].color0); + ok(color1 == tests[i].color1, "Test %u shading has color1 %08x, expected %08x.\n", + i, color1, tests[i].color1); + } + + IDirect3DVertexBuffer7_Release(vb_strip); + IDirect3DVertexBuffer7_Release(vb_list); + IDirectDrawSurface7_Release(rt); + IDirect3D7_Release(d3d); + refcount = IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -10254,4 +10390,5 @@ START_TEST(ddraw7) test_texcoordindex(); test_colorkey_precision(); test_range_colorkey(); + test_shademode(); }

1 0

Austin English : ntoskrnl.exe: Add ExDeleteNPagedLookasideList stub.
by Alexandre Julliard Nov. 13, 2015

Nov. 13, 2015

Module: wine Branch: master Commit: f876b033c2875a9ffc0ff958680d4762654182ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=f876b033c2875a9ffc0ff9586… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Nov 13 08:31:32 2015 +0100 ntoskrnl.exe: Add ExDeleteNPagedLookasideList stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f86c5db..f24901d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1431,6 +1431,15 @@ NTSTATUS WINAPI ExCreateCallback(PCALLBACK_OBJECT *obj, POBJECT_ATTRIBUTES attr, /*********************************************************************** + * ExDeleteNPagedLookasideList (NTOSKRNL.EXE.@) + */ +void WINAPI ExDeleteNPagedLookasideList( PNPAGED_LOOKASIDE_LIST lookaside ) +{ + FIXME("(%p) stub\n", lookaside); +} + + +/*********************************************************************** * ExFreePool (NTOSKRNL.EXE.@) */ void WINAPI ExFreePool( void *ptr ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index fe7dbfc..0210b37 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -123,7 +123,7 @@ @ stub ExAllocatePoolWithTagPriority @ stub ExConvertExclusiveToSharedLite @ stdcall ExCreateCallback(ptr ptr long long) -@ stub ExDeleteNPagedLookasideList +@ stdcall ExDeleteNPagedLookasideList(ptr) @ stub ExDeletePagedLookasideList @ stdcall ExDeleteResourceLite(ptr) @ stub ExDesktopObjectType

1 0

Andrey Gusev : include: Add d3dx10.h file.
by Alexandre Julliard Nov. 13, 2015

Nov. 13, 2015

Module: wine Branch: master Commit: 62e290edeee8463ce956d1293488b98992be786f URL: http://source.winehq.org/git/wine.git/?a=commit;h=62e290edeee8463ce956d1293… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Nov 10 00:00:23 2015 +0200 include: Add d3dx10.h file. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/d3dx10.h | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 299a095..27f0ef6 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -245,6 +245,7 @@ HEADER_SRCS = \ d3drmwin.h \ d3dtypes.h \ d3dvec.inl \ + d3dx10.h \ d3dx9.h \ d3dx9anim.h \ d3dx9core.h \ diff --git a/include/d3dx10.h b/include/d3dx10.h new file mode 100644 index 0000000..6333349 --- /dev/null +++ b/include/d3dx10.h @@ -0,0 +1,32 @@ +/* + * Copyright 2015 Andrey Gusev + * + * 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 + */ + +#ifndef __D3DX10_H__ +#define __D3DX10_H__ + +#include <limits.h> +#include <float.h> + +#define D3DX10_DEFAULT (0xffffffffu) +#define D3DX10_FROM_FILE (0xfffffffdu) +#define DXGI_FORMAT_FROM_FILE ((DXGI_FORMAT)0xfffffffdu) + +#include "d3d10.h" +#include "d3dx10core.h" + +#endif

1 0

Jacek Caban : kernel32: Added DECLSPEC_HOTPATCHABLE to WinExec function.
by Alexandre Julliard Nov. 13, 2015

Nov. 13, 2015

Module: wine Branch: master Commit: 1130a11ccedfb6692f384f13a131c1ed85b97882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1130a11ccedfb6692f384f13a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 16:05:01 2015 +0100 kernel32: Added DECLSPEC_HOTPATCHABLE to WinExec function. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 5e6ab10..17ae16d 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2556,7 +2556,7 @@ static DWORD wait_input_idle( HANDLE process, DWORD timeout ) /*********************************************************************** * WinExec (KERNEL32.@) */ -UINT WINAPI WinExec( LPCSTR lpCmdLine, UINT nCmdShow ) +UINT WINAPI DECLSPEC_HOTPATCH WinExec( LPCSTR lpCmdLine, UINT nCmdShow ) { PROCESS_INFORMATION info; STARTUPINFOA startup;

1 0

Piotr Caban : wininet: Create file with correct file name in test_trailing_slash tests.
by Alexandre Julliard Nov. 13, 2015

Nov. 13, 2015

Module: wine Branch: master Commit: 493d414cadd504992944b1139fba4118202deca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=493d414cadd504992944b1139… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 12 18:22:27 2015 +0100 wininet: Create file with correct file name in test_trailing_slash tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/urlcache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 37ee412..310054b 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -1086,7 +1086,7 @@ static void test_trailing_slash(void) ret = CreateUrlCacheEntryA(url_with_slash, 0, "html", filename, 0); ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); - create_and_write_file(filenameA, &zero_byte, sizeof(zero_byte)); + create_and_write_file(filename, &zero_byte, sizeof(zero_byte)); ret = CommitUrlCacheEntryA("Visited: http://testing.cache.com/", NULL, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY, NULL, 0, "html", NULL);

1 0

Alexandre Julliard : makefiles: Install source directory files from the top-level makefile.
by Alexandre Julliard Nov. 13, 2015

Nov. 13, 2015

Module: wine Branch: master Commit: 9b71b3669e3065eefe7a6e1c4559fe44ad728415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b71b3669e3065eefe7a6e1c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 13 16:07:49 2015 +0900 makefiles: Install source directory files from the top-level makefile. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 25 ++++++++++--------------- configure.ac | 27 ++++++++++++--------------- 2 files changed, 22 insertions(+), 30 deletions(-) diff --git a/configure b/configure index 0aa17fc..8b0b2c9 100755 --- a/configure +++ b/configure @@ -8763,15 +8763,6 @@ libwine_DEPS = wine.map ${wine_binary}_OBJS = main.o ${wine_binary}_LDFLAGS = $LDEXECFLAGS -lwine \$(PTHREAD_LIBS) " - if test -z "$with_wine64" - then - as_fn_append LOADER_RULES " -install install-lib:: - \$(INSTALL_DATA) \$(srcdir)/wine.desktop \$(DESTDIR)\$(datadir)/applications/wine.desktop -uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/applications/wine.desktop -" - fi ;; esac @@ -18319,13 +18310,17 @@ clean:: \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader" else loader_install="$loader_install wine.inf" - as_fn_append LOADER_RULES " -install install-lib:: - \$(INSTALL_DATA) \$(srcdir)/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls - + wine_fn_append_rule "install install-lib:: + \$(INSTALL_DATA) $srcdir/loader/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls -" + \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls" + case $host_os in + cygwin*|mingw32*|darwin*|macosx*|linux-android*) ;; + *) wine_fn_append_rule "install install-lib:: + \$(INSTALL_DATA) $srcdir/loader/wine.desktop \$(DESTDIR)\$(datadir)/applications/wine.desktop +uninstall:: + \$(RM) \$(DESTDIR)\$(datadir)/applications/wine.desktop" ;; + esac fi as_fn_append LOADER_RULES " diff --git a/configure.ac b/configure.ac index 685b346..f86fd2b 100644 --- a/configure.ac +++ b/configure.ac @@ -962,15 +962,6 @@ libwine_DEPS = wine.map ${wine_binary}_OBJS = main.o ${wine_binary}_LDFLAGS = $LDEXECFLAGS -lwine \$(PTHREAD_LIBS) "]) - if test -z "$with_wine64" - then - AS_VAR_APPEND([LOADER_RULES],[" -install install-lib:: - \$(INSTALL_DATA) \$(srcdir)/wine.desktop \$(DESTDIR)\$(datadir)/applications/wine.desktop -uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/applications/wine.desktop -"]) - fi ;; esac @@ -3692,13 +3683,19 @@ clean:: \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) else loader_install="$loader_install wine.inf" - AS_VAR_APPEND([LOADER_RULES],[" -install install-lib:: - \$(INSTALL_DATA) \$(srcdir)/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls - + WINE_APPEND_RULE( +[install install-lib:: + \$(INSTALL_DATA) $srcdir/loader/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls -"]) + \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls]) + case $host_os in + cygwin*|mingw32*|darwin*|macosx*|linux-android*) ;; + *) WINE_APPEND_RULE( +[install install-lib:: + \$(INSTALL_DATA) $srcdir/loader/wine.desktop \$(DESTDIR)\$(datadir)/applications/wine.desktop +uninstall:: + \$(RM) \$(DESTDIR)\$(datadir)/applications/wine.desktop]) ;; + esac fi AS_VAR_APPEND([LOADER_RULES],["

1 0

Alistair Leslie-Hughes : odbccp32: Remove duplicate string.
by Alexandre Julliard Nov. 13, 2015

Nov. 13, 2015

Module: wine Branch: master Commit: d77423093cad30de0363a993a36c965e3099b23e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d77423093cad30de0363a993a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 13 17:49:49 2015 +1100 odbccp32: Remove duplicate string. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 7aac6dd..bc643d4 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(odbc); /* Registry key names */ static const WCHAR drivers_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','O','D','B','C','I','N','S','T','.','I','N','I','\\','O','D','B','C',' ','D','r','i','v','e','r','s',0}; +static const WCHAR odbcW[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C',0}; /* This config mode is known to be process-wide. * MSDN documentation suggests that the value is hidden somewhere in the registry but I haven't found it yet. @@ -401,7 +402,6 @@ BOOL WINAPI SQLGetInstalledDrivers(LPSTR lpszBuf, WORD cbBufMax, static HKEY get_privateprofile_sectionkey(LPCWSTR section, LPCWSTR filename) { - static const WCHAR odbcW[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\',0}; HKEY hkey, hkeyfilename, hkeysection; LONG ret; @@ -1165,7 +1165,6 @@ BOOL WINAPI SQLWritePrivateProfileStringW(LPCWSTR lpszSection, LPCWSTR lpszEntry { LONG ret; HKEY hkey; - WCHAR softwareodbc[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C',0}; clear_errors(); TRACE("%s %s %s %s\n", debugstr_w(lpszSection), debugstr_w(lpszEntry), @@ -1177,7 +1176,7 @@ BOOL WINAPI SQLWritePrivateProfileStringW(LPCWSTR lpszSection, LPCWSTR lpszEntry return FALSE; } - if ((ret = RegCreateKeyW(HKEY_CURRENT_USER, softwareodbc, &hkey)) == ERROR_SUCCESS) + if ((ret = RegCreateKeyW(HKEY_CURRENT_USER, odbcW, &hkey)) == ERROR_SUCCESS) { HKEY hkeyfilename;

1 0

Austin English : ntoskrnl.exe: Add a stub for ProbeForRead.
by Alexandre Julliard Nov. 13, 2015

Nov. 13, 2015

Module: wine Branch: master Commit: 9191690ca6ad74e3d5b707d4939222e6858eac8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9191690ca6ad74e3d5b707d49… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Nov 13 08:30:26 2015 +0100 ntoskrnl.exe: Add a stub for ProbeForRead. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 78cc13b..571f07b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2344,3 +2344,11 @@ void WINAPI KeLeaveCriticalRegion(void) { FIXME(": stub\n"); } + +/*********************************************************************** + * ProbeForRead (NTOSKRNL.EXE.@) + */ +void WINAPI ProbeForRead(void *address, SIZE_T length, ULONG alignment) +{ + FIXME("(%p %lu %u) stub\n", address, length, alignment); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0f8f3ba..936d74f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -835,7 +835,7 @@ @ stub PoShutdownBugCheck @ stub PoStartNextPowerIrp @ stub PoUnregisterSystemState -@ stub ProbeForRead +@ stdcall ProbeForRead(ptr long long) @ stub ProbeForWrite @ stub PsAssignImpersonationToken @ stub PsChargePoolQuota

1 0

Sebastian Lackner : ntoskrnl.exe: Add a stub for ProbeForWrite.
by Alexandre Julliard Nov. 13, 2015

Nov. 13, 2015

Module: wine Branch: master Commit: 9f94214ecd5853541faab36d0c99bc8b8c91cb12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f94214ecd5853541faab36d0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Nov 13 08:31:05 2015 +0100 ntoskrnl.exe: Add a stub for ProbeForWrite. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 571f07b..f86c5db 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2352,3 +2352,11 @@ void WINAPI ProbeForRead(void *address, SIZE_T length, ULONG alignment) { FIXME("(%p %lu %u) stub\n", address, length, alignment); } + +/*********************************************************************** + * ProbeForWrite (NTOSKRNL.EXE.@) + */ +void WINAPI ProbeForWrite(void *address, SIZE_T length, ULONG alignment) +{ + FIXME("(%p %lu %u) stub\n", address, length, alignment); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 936d74f..fe7dbfc 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -836,7 +836,7 @@ @ stub PoStartNextPowerIrp @ stub PoUnregisterSystemState @ stdcall ProbeForRead(ptr long long) -@ stub ProbeForWrite +@ stdcall ProbeForWrite(ptr long long) @ stub PsAssignImpersonationToken @ stub PsChargePoolQuota @ stub PsChargeProcessNonPagedPoolQuota

1 0

Austin English : wine.inf: Add Windows Media Player version registry keys.
by Alexandre Julliard Nov. 13, 2015

Nov. 13, 2015

Module: wine Branch: master Commit: 76faeeb50f66cb5ba211b7ea4cc00df5a129284d URL: http://source.winehq.org/git/wine.git/?a=commit;h=76faeeb50f66cb5ba211b7ea4… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 12 17:21:32 2015 -0600 wine.inf: Add Windows Media Player version registry keys. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index fea8da4..e091727 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -635,6 +635,7 @@ HKLM,Software\Microsoft\DFS,,16 HKLM,Software\Microsoft\Driver Signing,,16 HKLM,Software\Microsoft\EnterpriseCertificates,,16 HKLM,Software\Microsoft\EventSystem,,16 +HKLM,Software\Microsoft\MediaPlayer\PlayerUpgrade,"PlayerVersion",2,"12,0,7601,18840" HKLM,Software\Microsoft\MSMQ,,16 HKLM,Software\Microsoft\Non-Driver Signing,,16 HKLM,Software\Microsoft\Notepad\DefaultFonts,,16 @@ -676,6 +677,12 @@ HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-99 HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"Locale",2,"*" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"Version",2,"4,74,9273,0" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},,2,"Windows Media Player" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"ComponentID",2,"wmp" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"IsInstalled",2,1 +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"Locale",2,"*" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"Version",2,"12,0,7601,18840" + [Nls] HKLM,System\CurrentControlSet\Control\Nls\Codepage,"37",,"" HKLM,System\CurrentControlSet\Control\Nls\Language,"0401",,""

1 0