October 2019 - Wine-Commits

Alexandre Julliard : psapi/tests: Increase some timeouts.
by Alexandre Julliard Oct. 30, 2019

Oct. 30, 2019

Module: wine Branch: master Commit: 3f61f905ba3f12e83acfb8b82c1da7f8ac4d5227 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f61f905ba3f12e83acfb8b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 30 22:35:35 2019 +0100 psapi/tests: Increase some timeouts. These are too short when running under QEMU. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/psapi/tests/psapi_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index b02ceed5ec..9799d2ffae 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -125,7 +125,7 @@ static void test_EnumProcessModules(void) ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess failed: %u\n", GetLastError()); - ret = WaitForInputIdle(pi.hProcess, 1000); + ret = WaitForInputIdle(pi.hProcess, 5000); ok(!ret, "wait timed out\n"); SetLastError(0xdeadbeef); @@ -146,7 +146,7 @@ static void test_EnumProcessModules(void) ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess failed: %u\n", GetLastError()); - ret = WaitForInputIdle(pi.hProcess, 1000); + ret = WaitForInputIdle(pi.hProcess, 5000); ok(!ret, "wait timed out\n"); SetLastError(0xdeadbeef); @@ -180,7 +180,7 @@ todo_wine pWow64RevertWow64FsRedirection(cookie); ok(ret, "CreateProcess failed: %u\n", GetLastError()); - ret = WaitForInputIdle(pi.hProcess, 1000); + ret = WaitForInputIdle(pi.hProcess, 5000); ok(!ret, "wait timed out\n"); SetLastError(0xdeadbeef);

1 0

Alexandre Julliard : wine.inf: Add ARM64 sections.
by Alexandre Julliard Oct. 30, 2019

Oct. 30, 2019

Module: wine Branch: master Commit: 0ce5c82a3ce6d7665ff9fe83e20c0aa9892d7685 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ce5c82a3ce6d7665ff9fe83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 30 21:10:16 2019 +0100 wine.inf: Add ARM64 sections. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 4c7b21bcc5..0ae057dc4c 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -102,6 +102,33 @@ AddReg=\ VersionInfo.ntamd64,\ LicenseInformation +[DefaultInstall.ntarm64] +RegisterDlls=RegisterDllsSection +WineFakeDlls=FakeDllsWin64,FakeDlls +WinePreInstall=Wow64 +UpdateInis=SystemIni +CopyFiles=l_intl_section, inf_section +AddReg=\ + Classes,\ + ContentIndex,\ + ControlClass,\ + CurrentVersion,\ + CurrentVersionWow64,\ + Debugger,\ + DirectX,\ + Fonts,\ + MCI,\ + Misc,\ + Nls,\ + OLE,\ + Printing,\ + Services, \ + SessionMgr,\ + Tapi,\ + Timezones,\ + VersionInfo.ntamd64,\ + LicenseInformation + [Wow64Install] RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDllsWow64 @@ -117,6 +144,9 @@ AddReg=\ VersionInfo.ntamd64,\ LicenseInformation +[Wow64Install.ntarm64] +WineFakeDlls=FakeDllsWin32 + [DefaultInstall.Services] AddService=BITS,0,BITSService AddService=HTTP,0,HTTPService @@ -171,6 +201,24 @@ AddService=WineBus,0,WineBusService AddService=Winmgmt,0,WinmgmtService AddService=wuauserv,0,wuauService +[DefaultInstall.ntarm64.Services] +AddService=BITS,0,BITSService +AddService=HTTP,0,HTTPService +AddService=MSIServer,0,MSIService +AddService=MountMgr,0x800,MountMgrService +AddService=RpcSs,0,RpcSsService +AddService=Spooler,0,SpoolerService +AddService=StiSvc,0,StiService +AddService=TermService,0,TerminalServices +AddService=PlugPlay,0,PlugPlayService +AddService=FontCache3.0.0.0,0,WPFFontCacheService +AddService=LanmanServer,0,LanmanServerService +AddService=FontCache,0,FontCacheService +AddService=Schedule,0,TaskSchedulerService +AddService=WineBus,0,WineBusService +AddService=Winmgmt,0,WinmgmtService +AddService=wuauserv,0,wuauService + [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" Mci32Str="Software\Microsoft\Windows NT\CurrentVersion\MCI32"

1 0

Alexandre Julliard : ole32/tests: Increase a timeout.
by Alexandre Julliard Oct. 30, 2019

Oct. 30, 2019

Module: wine Branch: master Commit: bb22b55e6db927deff4aecf4c65ed06801f8b073 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb22b55e6db927deff4aecf4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 30 22:33:15 2019 +0100 ole32/tests: Increase a timeout. It's too short when running under QEMU. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 6361f5f0da..69a38d48b2 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -3031,7 +3031,7 @@ static void test_CoWaitForMultipleHandles(void) /* test message pumping when CoWaitForMultipleHandles is called from non main apartment thread */ thread = CreateThread(NULL, 0, test_CoWaitForMultipleHandles_thread, handles, 0, &tid); - index = WaitForSingleObject(thread, 500); + index = WaitForSingleObject(thread, 5000); ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); CloseHandle(thread);

1 0

Piotr Caban : ntdll: Use SIZE_T to store passed buffer size in sprintf.
by Alexandre Julliard Oct. 30, 2019

Oct. 30, 2019

Module: wine Branch: master Commit: 92731ccbbe7681b10c40cd69d2cbb12c95ca211f URL: https://source.winehq.org/git/wine.git/?a=commit;h=92731ccbbe7681b10c40cd69… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 30 12:16:20 2019 +0100 ntdll: Use SIZE_T to store passed buffer size in sprintf. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/printf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/printf.c b/dlls/ntdll/printf.c index 018f774dc0..4176f945f5 100644 --- a/dlls/ntdll/printf.c +++ b/dlls/ntdll/printf.c @@ -43,8 +43,8 @@ static const SIZE_T size_max = ~(SIZE_T)0 >> 1; typedef struct pf_output_t { - int used; - int len; + SIZE_T used; + SIZE_T len; BOOL unicode; union { LPWSTR W; @@ -68,7 +68,7 @@ typedef struct pf_flags_t */ static inline int pf_output_stringW( pf_output *out, LPCWSTR str, int len ) { - int space = out->len - out->used; + SIZE_T space = out->len - out->used; if( len < 0 ) len = strlenW( str ); @@ -122,7 +122,7 @@ static inline int pf_output_stringW( pf_output *out, LPCWSTR str, int len ) static inline int pf_output_stringA( pf_output *out, LPCSTR str, int len ) { - int space = out->len - out->used; + SIZE_T space = out->len - out->used; if( len < 0 ) len = strlen( str );

1 0

Alexandre Julliard : rpcrt4/tests: Increase some timeouts.
by Alexandre Julliard Oct. 30, 2019

Oct. 30, 2019

Module: wine Branch: master Commit: 822e2773d45544e3972c3d0e9dd60a6598d7a84f URL: https://source.winehq.org/git/wine.git/?a=commit;h=822e2773d45544e3972c3d0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 30 22:32:54 2019 +0100 rpcrt4/tests: Increase some timeouts. These are too short when running under QEMU. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/cstub.c | 2 +- dlls/rpcrt4/tests/server.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 6b99e82408..e0f519fa1d 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -1383,7 +1383,7 @@ static void test_delegated_methods(void) ready_event = CreateEventA(NULL, TRUE, FALSE, "wine_cstub_test_server_ready"); process = create_process("server"); - ok(!WaitForSingleObject(ready_event, 1000), "wait failed\n"); + ok(!WaitForSingleObject(ready_event, 5000), "wait failed\n"); hr = NdrDllGetClassObject(&CLSID_test_ps, &IID_IPSFactoryBuffer, (void **)&ps, &aProxyFileList, &CLSID_test_ps, &gPFactory); diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index e6555fa18b..a07e2f1787 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -2290,7 +2290,7 @@ static void run_server(HANDLE ready_event) ret = SetEvent(ready_event); ok(ret, "SetEvent failed: %u\n", GetLastError()); - ret = WaitForSingleObject(stop_event, 1000); + ret = WaitForSingleObject(stop_event, 5000); ok(WAIT_OBJECT_0 == ret, "WaitForSingleObject\n"); status = RpcMgmtWaitServerListen();

1 0

Alexandre Julliard : setupapi: Define .inf section names for ARM platforms.
by Alexandre Julliard Oct. 30, 2019

Oct. 30, 2019

Module: wine Branch: master Commit: b2b3975f46c203a129a946128ccd018dd7ed6e46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2b3975f46c203a129a94612… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 30 20:19:50 2019 +0100 setupapi: Define .inf section names for ARM platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/install.c | 4 ++++ dlls/setupapi/query.c | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 483835db24..e166754168 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1212,6 +1212,10 @@ void WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, LPCWSTR cmdline, I static const WCHAR nt_platformW[] = {'.','n','t','x','8','6',0}; #elif defined(__x86_64__) static const WCHAR nt_platformW[] = {'.','n','t','a','m','d','6','4',0}; +#elif defined(__arm__) + static const WCHAR nt_platformW[] = {'.','n','t','a','r','m',0}; +#elif defined(__aarch64__) + static const WCHAR nt_platformW[] = {'.','n','t','a','r','m','6','4',0}; #else /* FIXME: other platforms */ static const WCHAR nt_platformW[] = {'.','n','t',0}; #endif diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index cbb77d53e4..ea1b969618 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -43,6 +43,16 @@ static const WCHAR source_disks_names_platform[] = {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s','.','a','m','d','6','4',0}; static const WCHAR source_disks_files_platform[] = {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s','.','a','m','d','6','4',0}; +#elif defined(__arm__) +static const WCHAR source_disks_names_platform[] = + {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s','.','a','r','m',0}; +static const WCHAR source_disks_files_platform[] = + {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s','.','a','r','m',0}; +#elif defined(__aarch64__) +static const WCHAR source_disks_names_platform[] = + {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s','.','a','r','m','6','4',0}; +static const WCHAR source_disks_files_platform[] = + {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s','.','a','r','m','6','4',0}; #else /* FIXME: other platforms */ static const WCHAR source_disks_names_platform[] = {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s',0};

1 0

Connor McAdams : d3d10: Move debug_d3d10_driver_type() to d3d10_main.c.
by Alexandre Julliard Oct. 30, 2019

Oct. 30, 2019

Module: wine Branch: master Commit: ae1cc9c742e5853e6e75d139e52f175f36528cb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae1cc9c742e5853e6e75d139… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Wed Oct 30 17:49:32 2019 +0330 d3d10: Move debug_d3d10_driver_type() to d3d10_main.c. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_main.c | 19 +++++++++++++++++++ dlls/d3d10/d3d10_private.h | 1 - dlls/d3d10/utils.c | 15 --------------- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index e3d1c57e44..a54c44bdbb 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -24,6 +24,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); +#define WINE_D3D10_TO_STR(x) case x: return #x + +static const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type) +{ + switch (driver_type) + { + WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_HARDWARE); + WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_REFERENCE); + WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_NULL); + WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_SOFTWARE); + WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_WARP); + default: + FIXME("Unrecognised D3D10_DRIVER_TYPE %#x.\n", driver_type); + return "unrecognised"; + } +} + +#undef WINE_D3D10_TO_STR + static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, UINT sdk_version, ID3D10Device **device) { diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index c9e6dbb823..1deba9c860 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -41,7 +41,6 @@ #define D3DERR_INVALIDCALL 0x8876086c /* TRACE helper functions */ -const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type) DECLSPEC_HIDDEN; const char *debug_d3d10_device_state_types(D3D10_DEVICE_STATE_TYPES t) DECLSPEC_HIDDEN; enum d3d10_effect_object_type diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c index fca8994ff2..680a11f37e 100644 --- a/dlls/d3d10/utils.c +++ b/dlls/d3d10/utils.c @@ -23,21 +23,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); #define WINE_D3D10_TO_STR(x) case x: return #x -const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type) -{ - switch(driver_type) - { - WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_HARDWARE); - WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_REFERENCE); - WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_NULL); - WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_SOFTWARE); - WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_WARP); - default: - FIXME("Unrecognized D3D10_DRIVER_TYPE %#x\n", driver_type); - return "unrecognized"; - } -} - const char *debug_d3d10_device_state_types(D3D10_DEVICE_STATE_TYPES t) { switch (t)

1 0

Vijay Kiran Kamuju : ucrtbase: Implement %g format for strftime.
by Alexandre Julliard Oct. 30, 2019

Oct. 30, 2019

Module: wine Branch: master Commit: 54f4bfb06d694eb6d82d2ea77a77dac72ec052c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54f4bfb06d694eb6d82d2ea7… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Oct 29 14:43:52 2019 +0100 ucrtbase: Implement %g format for strftime. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 11 +++++++++-- dlls/ucrtbase/tests/misc.c | 15 +++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 8f4d64b361..9787d18e3f 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1196,14 +1196,21 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 0, 31)) return 0; break; + case 'g': case 'G': tmp = 1900 + mstm->tm_year; if (mstm->tm_yday - (mstm->tm_wday ? mstm->tm_wday : 7) + 4 < 0) tmp--; else if(mstm->tm_yday - (mstm->tm_wday ? mstm->tm_wday : 7) + 5 > 365 + IsLeapYear(tmp)) tmp++; - if (!strftime_int(str, &ret, max, tmp, 4, 0, 9999)) - return 0; + if(*format == 'G') + { + if (!strftime_int(str, &ret, max, tmp, 4, 0, 9999)) + return 0; + } else { + if (!strftime_int(str, &ret, max, tmp%100, 2, 0, 99)) + return 0; + } break; #endif case 'H': diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 9cfe532560..8a6fb7b8e1 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -968,6 +968,14 @@ static void test_strftime(void) ok(retA == 1, "expected 1, got %d\n", (int)retA); ok(!strcmp(bufA, "\t"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%g", &epoch); + ok(retA == 2, "expected 2, got %d\n", (int)retA); + ok(!strcmp(bufA, "70"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%g", &tm1); + ok(retA == 2, "expected 2, got %d\n", (int)retA); + ok(!strcmp(bufA, "16"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%G", &epoch); ok(retA == 4, "expected 4, got %d\n", (int)retA); ok(!strcmp(bufA, "1970"), "got %s\n", bufA); @@ -981,6 +989,13 @@ static void test_strftime(void) __time32_t t = (365*2 + i - 7) * 24 * 60 * 60; struct tm tm = *p__gmtime32(&t); + retA = p_strftime(bufA, sizeof(bufA), "%g", &tm); + ok(retA == 2, "%d) retA = %d\n", i, (int)retA); + if (i <= 8) + ok(!strcmp(bufA, "71"), "%d) got %s, expected 71\n", i, bufA); + else + ok(!strcmp(bufA, "72"), "%d) got %s, expected 72\n", i, bufA); + retA = p_strftime(bufA, sizeof(bufA), "%G", &tm); ok(retA == 4, "%d) retA = %d\n", i, (int)retA); if (i <= 8)

1 0

Connor McAdams : d3d10: Move debug_d3d10_device_state_types() to stateblock.c.
by Alexandre Julliard Oct. 30, 2019

Oct. 30, 2019

Module: wine Branch: master Commit: 79aaabeb7f0c2d3686e04e98a928adae87ac79fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=79aaabeb7f0c2d3686e04e98… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Wed Oct 30 17:49:33 2019 +0330 d3d10: Move debug_d3d10_device_state_types() to stateblock.c. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/Makefile.in | 3 +-- dlls/d3d10/d3d10_private.h | 3 --- dlls/d3d10/stateblock.c | 38 +++++++++++++++++++++++++++++ dlls/d3d10/utils.c | 60 ---------------------------------------------- 4 files changed, 39 insertions(+), 65 deletions(-) diff --git a/dlls/d3d10/Makefile.in b/dlls/d3d10/Makefile.in index e76f3c5f19..dec11188c4 100644 --- a/dlls/d3d10/Makefile.in +++ b/dlls/d3d10/Makefile.in @@ -8,7 +8,6 @@ C_SRCS = \ d3d10_main.c \ effect.c \ shader.c \ - stateblock.c \ - utils.c + stateblock.c RC_SRCS = version.rc diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 1deba9c860..fadd027f7a 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -40,9 +40,6 @@ */ #define D3DERR_INVALIDCALL 0x8876086c -/* TRACE helper functions */ -const char *debug_d3d10_device_state_types(D3D10_DEVICE_STATE_TYPES t) DECLSPEC_HIDDEN; - enum d3d10_effect_object_type { D3D10_EOT_RASTERIZER_STATE = 0x0, diff --git a/dlls/d3d10/stateblock.c b/dlls/d3d10/stateblock.c index e20a4e31f3..ccc8a0e504 100644 --- a/dlls/d3d10/stateblock.c +++ b/dlls/d3d10/stateblock.c @@ -65,6 +65,44 @@ struct d3d10_stateblock BOOL predicate_value; }; +#define WINE_D3D10_TO_STR(x) case x: return #x + +static const char *debug_d3d10_device_state_types(D3D10_DEVICE_STATE_TYPES t) +{ + switch (t) + { + WINE_D3D10_TO_STR(D3D10_DST_SO_BUFFERS); + WINE_D3D10_TO_STR(D3D10_DST_OM_RENDER_TARGETS); + WINE_D3D10_TO_STR(D3D10_DST_DEPTH_STENCIL_STATE); + WINE_D3D10_TO_STR(D3D10_DST_BLEND_STATE); + WINE_D3D10_TO_STR(D3D10_DST_VS); + WINE_D3D10_TO_STR(D3D10_DST_VS_SAMPLERS); + WINE_D3D10_TO_STR(D3D10_DST_VS_SHADER_RESOURCES); + WINE_D3D10_TO_STR(D3D10_DST_VS_CONSTANT_BUFFERS); + WINE_D3D10_TO_STR(D3D10_DST_GS); + WINE_D3D10_TO_STR(D3D10_DST_GS_SAMPLERS); + WINE_D3D10_TO_STR(D3D10_DST_GS_SHADER_RESOURCES); + WINE_D3D10_TO_STR(D3D10_DST_GS_CONSTANT_BUFFERS); + WINE_D3D10_TO_STR(D3D10_DST_PS); + WINE_D3D10_TO_STR(D3D10_DST_PS_SAMPLERS); + WINE_D3D10_TO_STR(D3D10_DST_PS_SHADER_RESOURCES); + WINE_D3D10_TO_STR(D3D10_DST_PS_CONSTANT_BUFFERS); + WINE_D3D10_TO_STR(D3D10_DST_IA_VERTEX_BUFFERS); + WINE_D3D10_TO_STR(D3D10_DST_IA_INDEX_BUFFER); + WINE_D3D10_TO_STR(D3D10_DST_IA_INPUT_LAYOUT); + WINE_D3D10_TO_STR(D3D10_DST_IA_PRIMITIVE_TOPOLOGY); + WINE_D3D10_TO_STR(D3D10_DST_RS_VIEWPORTS); + WINE_D3D10_TO_STR(D3D10_DST_RS_SCISSOR_RECTS); + WINE_D3D10_TO_STR(D3D10_DST_RS_RASTERIZER_STATE); + WINE_D3D10_TO_STR(D3D10_DST_PREDICATION); + default: + FIXME("Unrecognised D3D10_DEVICE_STATE_TYPES %#x.\n", t); + return "unrecognised"; + } +} + +#undef WINE_D3D10_TO_STR + static inline struct d3d10_stateblock *impl_from_ID3D10StateBlock(ID3D10StateBlock *iface) { return CONTAINING_RECORD(iface, struct d3d10_stateblock, ID3D10StateBlock_iface); diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c deleted file mode 100644 index 680a11f37e..0000000000 --- a/dlls/d3d10/utils.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2008-2009 Henri Verbeet for CodeWeavers - * - * 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 - * - */ - -#include "d3d10_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d10); - -#define WINE_D3D10_TO_STR(x) case x: return #x - -const char *debug_d3d10_device_state_types(D3D10_DEVICE_STATE_TYPES t) -{ - switch (t) - { - WINE_D3D10_TO_STR(D3D10_DST_SO_BUFFERS); - WINE_D3D10_TO_STR(D3D10_DST_OM_RENDER_TARGETS); - WINE_D3D10_TO_STR(D3D10_DST_DEPTH_STENCIL_STATE); - WINE_D3D10_TO_STR(D3D10_DST_BLEND_STATE); - WINE_D3D10_TO_STR(D3D10_DST_VS); - WINE_D3D10_TO_STR(D3D10_DST_VS_SAMPLERS); - WINE_D3D10_TO_STR(D3D10_DST_VS_SHADER_RESOURCES); - WINE_D3D10_TO_STR(D3D10_DST_VS_CONSTANT_BUFFERS); - WINE_D3D10_TO_STR(D3D10_DST_GS); - WINE_D3D10_TO_STR(D3D10_DST_GS_SAMPLERS); - WINE_D3D10_TO_STR(D3D10_DST_GS_SHADER_RESOURCES); - WINE_D3D10_TO_STR(D3D10_DST_GS_CONSTANT_BUFFERS); - WINE_D3D10_TO_STR(D3D10_DST_PS); - WINE_D3D10_TO_STR(D3D10_DST_PS_SAMPLERS); - WINE_D3D10_TO_STR(D3D10_DST_PS_SHADER_RESOURCES); - WINE_D3D10_TO_STR(D3D10_DST_PS_CONSTANT_BUFFERS); - WINE_D3D10_TO_STR(D3D10_DST_IA_VERTEX_BUFFERS); - WINE_D3D10_TO_STR(D3D10_DST_IA_INDEX_BUFFER); - WINE_D3D10_TO_STR(D3D10_DST_IA_INPUT_LAYOUT); - WINE_D3D10_TO_STR(D3D10_DST_IA_PRIMITIVE_TOPOLOGY); - WINE_D3D10_TO_STR(D3D10_DST_RS_VIEWPORTS); - WINE_D3D10_TO_STR(D3D10_DST_RS_SCISSOR_RECTS); - WINE_D3D10_TO_STR(D3D10_DST_RS_RASTERIZER_STATE); - WINE_D3D10_TO_STR(D3D10_DST_PREDICATION); - default: - FIXME("Unrecognized D3D10_DEVICE_STATE_TYPES %#x.\n", t); - return "unrecognized"; - } -} - -#undef WINE_D3D10_TO_STR

1 0

Connor McAdams : d3d10: Move private effect functions to effect.c.
by Alexandre Julliard Oct. 30, 2019

Oct. 30, 2019

Module: wine Branch: master Commit: b44d6c25b2b04762296d55df1479f128088bd01a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b44d6c25b2b04762296d55df… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Wed Oct 30 17:49:31 2019 +0330 d3d10: Move private effect functions to effect.c. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 34 --------- dlls/d3d10/effect.c | 186 +++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d10/utils.c | 156 ------------------------------------- 3 files changed, 186 insertions(+), 190 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b44d6c25b2b04762296d…

1 0