wine-commits April 2018

wine-commits@winehq.org

2 participants
542 discussions

Alexandre Julliard : user32/tests: Cleanup helper macros.
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: wine Branch: master Commit: 132c00fc9f4d464be1f5ea5d6309d83874e9ec8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=132c00fc9f4d464be1f5ea5d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 08:38:06 2018 +0200 user32/tests: Cleanup helper macros. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 780cfbb..2902913 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -54,7 +54,6 @@ static BOOL (WINAPI *pIsValidDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); static BOOL strict; static int dpi, real_dpi; static BOOL iswin9x; -static HDC hdc; #define eq(received, expected, label, type) \ ok((received) == (expected), "%s: got " type " instead of " type "\n", (label),(received),(expected)) @@ -1443,21 +1442,21 @@ static void test_SPI_SETDRAGFULLWINDOWS( void ) /* 37 */ ok(rc, "***warning*** failed to restore the original value: rc=%d err=%d\n", rc, GetLastError()); } -#define test_reg_metric( KEY, VAL, val) \ -{ INT regval;\ +#define test_reg_metric( KEY, VAL, val) do { \ + INT regval;\ regval = metricfromreg( KEY, VAL, dpi);\ ok( regval==val, "wrong value \"%s\" in registry %d, expected %d\n", VAL, regval, val);\ -} - -#define test_reg_metric2( KEY1, KEY2, VAL, val) \ -{ INT regval;\ +} while(0) + +#define test_reg_metric2( KEY1, KEY2, VAL, val) do { \ + INT regval;\ regval = metricfromreg( KEY1, VAL, dpi);\ if( regval != val) regval = metricfromreg( KEY2, VAL, dpi);\ ok( regval==val, "wrong value \"%s\" in registry %d, expected %d\n", VAL, regval, val);\ -} +} while(0) -#define test_reg_font( KEY, VAL, LF) \ -{ LOGFONTA lfreg;\ +#define test_reg_font( KEY, VAL, LF) do { \ + LOGFONTA lfreg;\ lffromreg( KEY, VAL, &lfreg);\ ok( (lfreg.lfHeight < 0 ? (LF).lfHeight == MulDiv( lfreg.lfHeight, dpi, real_dpi ) : \ MulDiv( -(LF).lfHeight , 72, dpi) == lfreg.lfHeight )&&\ @@ -1465,9 +1464,9 @@ static void test_SPI_SETDRAGFULLWINDOWS( void ) /* 37 */ (LF).lfWeight == lfreg.lfWeight &&\ !strcmp( (LF).lfFaceName, lfreg.lfFaceName)\ , "wrong value \"%s\" in registry %d, %d\n", VAL, (LF).lfHeight, lfreg.lfHeight);\ -} +} while(0) -#define TEST_NONCLIENTMETRICS_REG( ncm) \ +#define TEST_NONCLIENTMETRICS_REG( ncm) do { \ /*FIXME: test_reg_metric2( SPI_SETBORDER_REGKEY2, SPI_SETBORDER_REGKEY, SPI_SETBORDER_VALNAME, (ncm).iBorderWidth);*/\ test_reg_metric( SPI_METRIC_REGKEY, SPI_SCROLLWIDTH_VALNAME, (ncm).iScrollWidth);\ test_reg_metric( SPI_METRIC_REGKEY, SPI_SCROLLHEIGHT_VALNAME, (ncm).iScrollHeight);\ @@ -1481,16 +1480,18 @@ test_reg_font( SPI_METRIC_REGKEY, SPI_MENUFONT_VALNAME, (ncm).lfMenuFont);\ test_reg_font( SPI_METRIC_REGKEY, SPI_CAPTIONFONT_VALNAME, (ncm).lfCaptionFont);\ test_reg_font( SPI_METRIC_REGKEY, SPI_SMCAPTIONFONT_VALNAME, (ncm).lfSmCaptionFont);\ test_reg_font( SPI_METRIC_REGKEY, SPI_STATUSFONT_VALNAME, (ncm).lfStatusFont);\ -test_reg_font( SPI_METRIC_REGKEY, SPI_MESSAGEFONT_VALNAME, (ncm).lfMessageFont); +test_reg_font( SPI_METRIC_REGKEY, SPI_MESSAGEFONT_VALNAME, (ncm).lfMessageFont); } while(0) /* get text metric height value for the specified logfont */ static int get_tmheight( LOGFONTA *plf, int flag) { TEXTMETRICA tm; + HDC hdc = GetDC(0); HFONT hfont = CreateFontIndirectA( plf); hfont = SelectObject( hdc, hfont); GetTextMetricsA( hdc, &tm); hfont = SelectObject( hdc, hfont); + ReleaseDC( 0, hdc ); return tm.tmHeight + (flag ? tm.tmExternalLeading : 0); } @@ -1528,7 +1529,7 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */ Ncmorig.iSmCaptionHeight = metricfromreg( SPI_METRIC_REGKEY, SPI_SMCAPTIONHEIGHT_VALNAME, dpi); Ncmorig.iMenuHeight = metricfromreg( SPI_METRIC_REGKEY, SPI_MENUHEIGHT_VALNAME, dpi); /* test registry entries */ - TEST_NONCLIENTMETRICS_REG( Ncmorig) + TEST_NONCLIENTMETRICS_REG( Ncmorig); Ncmorig.lfCaptionFont.lfHeight = MulDiv( Ncmorig.lfCaptionFont.lfHeight, real_dpi, dpi ); /* make small changes */ @@ -1567,7 +1568,7 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */ rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSA), &Ncmcur, FALSE ); ok(rc, "SystemParametersInfoA: rc=%d err=%d\n", rc, GetLastError()); /* test registry entries */ - TEST_NONCLIENTMETRICS_REG( Ncmcur) + TEST_NONCLIENTMETRICS_REG( Ncmcur ); /* test the system metrics with these settings */ test_GetSystemMetrics(); /* now for something invalid: increase the {menu|caption|smcaption} fonts @@ -1587,7 +1588,7 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */ ok(rc, "SystemParametersInfoA: rc=%d err=%d\n", rc, GetLastError()); test_change_message( SPI_SETNONCLIENTMETRICS, 1 ); /* raw values are in registry */ - TEST_NONCLIENTMETRICS_REG( Ncmnew) + TEST_NONCLIENTMETRICS_REG( Ncmnew ); /* get them back */ rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSA), &Ncmcur, FALSE ); ok(rc, "SystemParametersInfoA: rc=%d err=%d\n", rc, GetLastError()); @@ -3304,6 +3305,7 @@ START_TEST(sysparams) char** argv; WNDCLASSA wc; MSG msg; + HDC hdc; HANDLE hThread; DWORD dwThreadId; HANDLE hInstance, hdll; @@ -3327,6 +3329,7 @@ START_TEST(sysparams) dpi = GetDeviceCaps( hdc, LOGPIXELSY); real_dpi = get_real_dpi(); trace("dpi %d real_dpi %d\n", dpi, real_dpi); + ReleaseDC( 0, hdc); iswin9x = GetVersion() & 0x80000000; /* This test requires interactivity, if we don't have it, give up */ @@ -3369,7 +3372,6 @@ START_TEST(sysparams) TranslateMessage( &msg ); DispatchMessageA( &msg ); } - ReleaseDC( 0, hdc); test_dpi_aware(); test_window_dpi();

1 0

Józef Kucia : build: Do not try to rebuild headers when widl is not found.
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: vkd3d Branch: master Commit: ab15973e6bbf7d08b6ff3cec62ec070aa4795d0e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ab15973e6bbf7d08b6ff3ce… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 13 12:37:43 2018 +0200 build: Do not try to rebuild headers when widl is not found. 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> --- Makefile.am | 8 ++++++-- configure.ac | 5 +++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index d10a0e3..8f0fc5f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -147,7 +147,11 @@ vkd3d_v_widl_1 = EXTRA_DIST += $(widl_headers) $(widl_headers:.h=.idl) $(widl_headers): %.h: %.idl +if HAVE_WIDL $(VKD3D_V_WIDL)$(WIDL) -o $@ $< +else + echo "widl is required to generate $<" +endif EXTRA_DIST += $(vkd3d_demos_shaders) @@ -173,7 +177,7 @@ CROSS_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/private -I$(builddir)/i CROSS_CFLAGS = -g -O2 -Wall -municode ${CROSS_CPPFLAGS} EXTRA_DIST += $(cross_implibs:=.cross32.def) $(cross_implibs:=.cross64.def) -if HAS_CROSSTARGET32 +if HAVE_CROSSTARGET32 CROSS32_CC = @CROSSCC32@ CROSS32_DLLTOOL = @CROSSTARGET32@-dlltool CROSS32_IMPLIBS = $(cross_implibs:=.cross32.a) @@ -198,7 +202,7 @@ else crosstest32: endif -if HAS_CROSSTARGET64 +if HAVE_CROSSTARGET64 CROSS64_CC = @CROSSCC64@ CROSS64_DLLTOOL = @CROSSTARGET64@-dlltool CROSS64_IMPLIBS = $(cross_implibs:=.cross64.a) diff --git a/configure.ac b/configure.ac index f9616e3..d00630b 100644 --- a/configure.ac +++ b/configure.ac @@ -88,8 +88,9 @@ VKD3D_CHECK_FUNC([HAVE_BUILTIN_POPCOUNT], [__builtin_popcount], [__builtin_popco VKD3D_CHECK_FUNC([HAVE_SYNC_ADD_AND_FETCH], [__sync_add_and_fetch], [__sync_add_and_fetch((int *)0, 0)]) VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_and_fetch((int *)0, 0)]) -AM_CONDITIONAL([HAS_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"]) -AM_CONDITIONAL([HAS_CROSSTARGET64], [test "x$CROSSTARGET64" != "xno"]) +AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"]) +AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"]) +AM_CONDITIONAL([HAVE_CROSSTARGET64], [test "x$CROSSTARGET64" != "xno"]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT

1 0

Józef Kucia : libs/vkd3d: Return early if there are no descriptors to update.
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: vkd3d Branch: master Commit: 2a430ae9916bec21429205f20cbb42f4dc3e5be8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2a430ae9916bec21429205f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 13 12:37:41 2018 +0200 libs/vkd3d: Return early if there are no descriptors to update. 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> --- libs/vkd3d/command.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index a056ca3..b7b774b 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2048,6 +2048,10 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list descriptor_count = 0; for (i = 0; i < descriptor_table->range_count; ++i) descriptor_count += descriptor_table->ranges[i].descriptor_count; + + if (!descriptor_count) + return; + if (!(descriptor_writes = vkd3d_calloc(descriptor_count, sizeof(*descriptor_writes)))) return; if (!(image_infos = vkd3d_calloc(descriptor_count, sizeof(*image_infos))))

1 0

Józef Kucia : libs/vkd3d: Fix memory leak in d3d12_pipeline_state_init_compute_uav_counters().
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: vkd3d Branch: master Commit: 8b8128b05596a897cd37d815872a77c90734edce URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8b8128b05596a897cd37d81… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 13 12:37:40 2018 +0200 libs/vkd3d: Fix memory leak in d3d12_pipeline_state_init_compute_uav_counters(). 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> --- libs/vkd3d/state.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 1749c00..b89f854 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1321,7 +1321,10 @@ static HRESULT d3d12_pipeline_state_init_compute_uav_counters(struct d3d12_pipel if (!(binding_desc = vkd3d_calloc(uav_counter_count, sizeof(*binding_desc)))) return E_OUTOFMEMORY; if (!(state->uav_counters = vkd3d_calloc(uav_counter_count, sizeof(*state->uav_counters)))) + { + vkd3d_free(binding_desc); return E_OUTOFMEMORY; + } state->uav_counter_mask = shader_info->uav_counter_mask; memset(&context, 0, sizeof(context));

1 0

Józef Kucia : libs/vkd3d: Fix memory leak in d3d12_command_queue_ExecuteCommandLists().
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: vkd3d Branch: master Commit: 277cdd4e9541a11d63eb8d78ca3ab26d3901769b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=277cdd4e9541a11d63eb8d7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 13 12:37:39 2018 +0200 libs/vkd3d: Fix memory leak in d3d12_command_queue_ExecuteCommandLists(). 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> --- libs/vkd3d/command.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 5605ab0..a056ca3 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4222,6 +4222,7 @@ static void STDMETHODCALLTYPE d3d12_command_queue_ExecuteCommandLists(ID3D12Comm if (!(vk_queue = vkd3d_queue_acquire(command_queue->vkd3d_queue))) { ERR("Failed to acquire queue %p.\n", command_queue->vkd3d_queue); + vkd3d_free(buffers); return; }

1 0

Józef Kucia : libs/vkd3d-shader: Get rid of redundant assignment from vkd3d_shader_find_signature_element( ).
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: vkd3d Branch: master Commit: 736d3c23fd5d37a40ddf0c368768d1ecb5470bed URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=736d3c23fd5d37a40ddf0c3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 13 12:37:38 2018 +0200 libs/vkd3d-shader: Get rid of redundant assignment from vkd3d_shader_find_signature_element(). 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> --- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 4934819..9db8b56 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -227,7 +227,7 @@ struct vkd3d_shader_signature_element *vkd3d_shader_find_signature_element( const struct vkd3d_shader_signature *signature, const char *semantic_name, unsigned int semantic_index, unsigned int stream_index) { - struct vkd3d_shader_signature_element *e = signature->elements; + struct vkd3d_shader_signature_element *e; unsigned int i; TRACE("signature %p, semantic_name %s, semantic_index %u, stream_index %u.\n",

1 0

Józef Kucia : libs/vkd3d-shader: Introduce VKD3DSPR_INVALID.
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: vkd3d Branch: master Commit: 83ce4553ea2bf08e2957b7ab2eb6833d93dbf377 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=83ce4553ea2bf08e2957b7a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 13 12:37:37 2018 +0200 libs/vkd3d-shader: Introduce VKD3DSPR_INVALID. Fixes clang warnings. 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> --- libs/vkd3d-shader/dxbc.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 0b5c3cf..5f87eae 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1378,8 +1378,8 @@ static BOOL shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr token = *(*ptr)++; register_type = (token & VKD3D_SM4_REGISTER_TYPE_MASK) >> VKD3D_SM4_REGISTER_TYPE_SHIFT; - if (register_type >= sizeof(register_type_table) / sizeof(*register_type_table) - || register_type_table[register_type] == ~0u) + if (register_type >= ARRAY_SIZE(register_type_table) + || register_type_table[register_type] == VKD3DSPR_INVALID) { FIXME("Unhandled register type %#x.\n", register_type); param->type = VKD3DSPR_TEMP; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 04e6b09..09c2e1d 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -352,6 +352,8 @@ enum vkd3d_shader_register_type VKD3DSPR_COVERAGE, VKD3DSPR_SAMPLEMASK, VKD3DSPR_GSINSTID, + + VKD3DSPR_INVALID = ~0u, }; enum vkd3d_shader_resource_type

1 0

Józef Kucia : libs/vkd3d-shader: Fix error code variable type in vkd3d_shader_compile_dxbc().
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: vkd3d Branch: master Commit: 7dd9420877854883b7491e582ee014b82fafb8cf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7dd9420877854883b7491e5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 13 12:37:36 2018 +0200 libs/vkd3d-shader: Fix error code variable type in vkd3d_shader_compile_dxbc(). 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> --- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 1bb89b3..4934819 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -64,7 +64,7 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, struct vkd3d_dxbc_compiler *spirv_compiler; struct vkd3d_shader_scan_info scan_info; struct vkd3d_shader_parser parser; - bool ret; + int ret; TRACE("dxbc {%p, %zu}, spirv %p, compiler_options %#x, shader_interface %p.\n", dxbc->code, dxbc->size, spirv, compiler_options, shader_interface);

1 0

Józef Kucia : libs/vkd3d: Propagate error code in vkd3d_fence_worker_stop().
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: vkd3d Branch: master Commit: 830f7c1e4978f0a37454c0d19e013c93eea415c1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=830f7c1e4978f0a37454c0d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 13 12:37:35 2018 +0200 libs/vkd3d: Propagate error code in vkd3d_fence_worker_stop(). 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> --- libs/vkd3d/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d9ad8f3..5605ab0 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -309,7 +309,7 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, if (FAILED(hr = device->join_thread(worker->u.handle))) { ERR("Failed to join fence worker thread, hr %#x.\n", hr); - return E_FAIL; + return hr; } } else

1 0

Alistair Leslie-Hughes : fltmgr.sys: Implement FltGetRoutineAddress.
by Alexandre Julliard 12 Apr '18

12 Apr '18

Module: wine Branch: master Commit: a7b33a6a428c9920d8130819373b1554bbd206c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7b33a6a428c9920d8130819… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Apr 4 23:18:22 2018 +0000 fltmgr.sys: Implement FltGetRoutineAddress. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fltmgr.sys/fltmgr.sys.spec | 2 +- dlls/fltmgr.sys/main.c | 15 +++++++++++++++ include/ddk/fltkernel.h | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/fltmgr.sys/fltmgr.sys.spec b/dlls/fltmgr.sys/fltmgr.sys.spec index c217ad3..7b1ba29 100644 --- a/dlls/fltmgr.sys/fltmgr.sys.spec +++ b/dlls/fltmgr.sys/fltmgr.sys.spec @@ -79,7 +79,7 @@ @ stub FltGetLowerInstance @ stub FltGetRequestorProcess @ stub FltGetRequestorProcessId -@ stub FltGetRoutineAddress +@ stdcall FltGetRoutineAddress(str) @ stub FltGetStreamContext @ stub FltGetStreamHandleContext @ stub FltGetSwappedBufferMdlAddress diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c index 2ffde97..16ca284 100644 --- a/dlls/fltmgr.sys/main.c +++ b/dlls/fltmgr.sys/main.c @@ -64,3 +64,18 @@ void WINAPI FltUnregisterFilter( PFLT_FILTER filter ) { FIXME( "(%p): stub\n", filter ); } + +void* WINAPI FltGetRoutineAddress(LPCSTR name) +{ + static const WCHAR fltmgrW[] = {'f','l','t','m','g','r','.','s','y','s',0}; + HMODULE mod = GetModuleHandleW(fltmgrW); + void *func; + + func = GetProcAddress(mod, name); + if (func) + TRACE( "%s -> %p\n", debugstr_a(name), func ); + else + FIXME( "%s not found\n", debugstr_a(name) ); + + return func; +} diff --git a/include/ddk/fltkernel.h b/include/ddk/fltkernel.h index 00b7dc5..8ebebfa 100644 --- a/include/ddk/fltkernel.h +++ b/include/ddk/fltkernel.h @@ -654,6 +654,7 @@ typedef struct _FLT_REGISTRATION } FLT_REGISTRATION, *PFLT_REGISTRATION; +void* WINAPI FltGetRoutineAddress(LPCSTR name); NTSTATUS WINAPI FltRegisterFilter(PDRIVER_OBJECT, const FLT_REGISTRATION *, PFLT_FILTER *); NTSTATUS WINAPI FltStartFiltering(PFLT_FILTER); void WINAPI FltUnregisterFilter(PFLT_FILTER);

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2018