wine-commits October 2018

wine-commits@winehq.org

1 participants
602 discussions

Józef Kucia : vkd3d-shader: Rename "output setup" function to "shader epilogue".
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: vkd3d Branch: master Commit: 7b58e7cb23a59a4a26aaf1e65c4ca5ad656e6b8e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7b58e7cb23a59a4a26aaf1e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 30 15:22:47 2018 +0100 vkd3d-shader: Rename "output setup" function to "shader epilogue". 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/spirv.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 09c6f9f..9419dc4 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1883,7 +1883,7 @@ struct vkd3d_dxbc_compiler uint32_t array_element_mask; } *output_info; uint32_t private_output_variable[MAX_REG_OUTPUT + 1]; /* 1 entry for oDepth */ - uint32_t output_setup_function_id; + uint32_t epilogue_function_id; uint32_t dummy_sampler_id; uint32_t binding_idx; @@ -3545,8 +3545,8 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler { unsigned int idx = vkd3d_dxbc_compiler_get_output_variable_index(compiler, reg->idx[0].offset); compiler->private_output_variable[idx] = var_id; - if (!compiler->output_setup_function_id) - compiler->output_setup_function_id = vkd3d_spirv_alloc_id(builder); + if (!compiler->epilogue_function_id) + compiler->epilogue_function_id = vkd3d_spirv_alloc_id(builder); } } @@ -4981,13 +4981,13 @@ static uint32_t vkd3d_dxbc_compiler_emit_conditional_branch(struct vkd3d_dxbc_co return merge_block_id; } -static void vkd3d_dxbc_compiler_emit_output_setup_invocation(struct vkd3d_dxbc_compiler *compiler) +static void vkd3d_dxbc_compiler_emit_shader_epilogue_invocation(struct vkd3d_dxbc_compiler *compiler) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t void_id, function_id, arguments[MAX_REG_OUTPUT]; unsigned int i, count; - if ((function_id = compiler->output_setup_function_id)) + if ((function_id = compiler->epilogue_function_id)) { void_id = vkd3d_spirv_get_op_type_void(builder); for (i = 0, count = 0; i < ARRAY_SIZE(compiler->private_output_variable); ++i) @@ -5006,7 +5006,7 @@ static void vkd3d_dxbc_compiler_emit_return(struct vkd3d_dxbc_compiler *compiler struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; if (compiler->shader_type != VKD3D_SHADER_TYPE_GEOMETRY) - vkd3d_dxbc_compiler_emit_output_setup_invocation(compiler); + vkd3d_dxbc_compiler_emit_shader_epilogue_invocation(compiler); vkd3d_spirv_build_op_return(builder); } @@ -6455,7 +6455,7 @@ static void vkd3d_dxbc_compiler_emit_emit_stream(struct vkd3d_dxbc_compiler *com return; } - vkd3d_dxbc_compiler_emit_output_setup_invocation(compiler); + vkd3d_dxbc_compiler_emit_shader_epilogue_invocation(compiler); vkd3d_spirv_build_op_emit_vertex(builder); } @@ -6857,7 +6857,7 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi } } -static void vkd3d_dxbc_compiler_emit_output_setup_function(struct vkd3d_dxbc_compiler *compiler) +static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_compiler *compiler) { uint32_t param_type_id[MAX_REG_OUTPUT + 1], param_id[MAX_REG_OUTPUT + 1] = {}; const struct vkd3d_shader_signature *signature = compiler->output_signature; @@ -6866,7 +6866,7 @@ static void vkd3d_dxbc_compiler_emit_output_setup_function(struct vkd3d_dxbc_com unsigned int i, count; DWORD variable_idx; - function_id = compiler->output_setup_function_id; + function_id = compiler->epilogue_function_id; assert(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_id)); assert(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_type_id)); @@ -6883,7 +6883,7 @@ static void vkd3d_dxbc_compiler_emit_output_setup_function(struct vkd3d_dxbc_com vkd3d_spirv_build_op_function(builder, void_id, function_id, SpvFunctionControlMaskNone, function_type_id); - vkd3d_spirv_build_op_name(builder, function_id, "setup_output"); + vkd3d_spirv_build_op_name(builder, function_id, "epilogue"); for (i = 0; i < ARRAY_SIZE(compiler->private_output_variable); ++i) { @@ -6922,8 +6922,8 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, vkd3d_spirv_build_op_function_end(builder); - if (compiler->output_setup_function_id) - vkd3d_dxbc_compiler_emit_output_setup_function(compiler); + if (compiler->epilogue_function_id) + vkd3d_dxbc_compiler_emit_shader_epilogue_function(compiler); if (compiler->options & VKD3D_SHADER_STRIP_DEBUG) vkd3d_spirv_stream_clear(&builder->debug_stream);

1 0

Francois Gouget : testbot: Build the list of test units impacted by module patches.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: tools Branch: master Commit: 954f6a7bfa64851fb43349b268095569e3eda2df URL: https://source.winehq.org/git/tools.git/?a=commit;h=954f6a7bfa64851fb43349b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 30 03:42:20 2018 +0100 testbot: Build the list of test units impacted by module patches. A patch to a dll or program is likely to impact its test units. This makes it possible to know which tests units to rerun. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 444ffaf..fb4f886 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -216,6 +216,7 @@ sub _HandleFile($$$) my $Module = _CreateTestInfo($Impacts, $Root, $Dir); $Impacts->{PatchedModules} = 1; + $Impacts->{Tests}->{$Module}->{PatchedModule} = 1; if ($File eq "Makefile.in" and $Change ne "modify") { @@ -407,20 +408,23 @@ sub GetPatchImpacts($) $TestInfo->{Units} = {}; foreach my $File (keys %{$TestInfo->{Files}}) { - # Skip unmodified files - next if (!$TestInfo->{All} and !$TestInfo->{Files}->{$File}); - my $Base = $File; # Non-C files are not test units next if ($Base !~ s/(?:\.c|\.spec)$//); # Helper dlls are not test units next if (exists $TestInfo->{Files}->{"$Base.spec"}); + # Don't try running a deleted test unit obviously + next if ($TestInfo->{Files}->{$File} eq "rm"); - if (($TestInfo->{All} or $TestInfo->{Files}->{$File}) and - $TestInfo->{Files}->{$File} ne "rm") + if ($TestInfo->{All} or $TestInfo->{Files}->{$File}) { - # Only new/modified test units are impacted $TestInfo->{Units}->{$Base} = 1; + $Impacts->{ModuleUnitCount}++; + } + elsif ($TestInfo->{PatchedModule}) + { + # The module has been patched so this test unit is impacted indirectly. + $Impacts->{ModuleUnitCount}++; } }

1 0

Francois Gouget : testbot/WineRunWineTest: Remove support for the build Step type.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: tools Branch: master Commit: c4f54ba61543016f0922a22170538e4b3e0f66c8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c4f54ba61543016f0922a22… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 30 03:42:02 2018 +0100 testbot/WineRunWineTest: Remove support for the build Step type. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunWineTest.pl | 75 ++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 39 deletions(-) diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 5b6eb33..3784ef0 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -383,7 +383,7 @@ if (!$VM->GetDomain()->IsPoweredOn()) FatalError("The VM is not powered on\n"); } -if ($Step->Type ne "build" and $Step->Type ne "suite" and $Step->Type ne "single") +if ($Step->Type ne "suite" and $Step->Type ne "single") { FatalError("Unexpected step type '". $Step->Type ."' found\n"); } @@ -497,7 +497,7 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) } else { - $PossibleCrash = 1 if ($Step->Type ne "build"); + $PossibleCrash = 1; $TAError = "An error occurred while waiting for the task to complete: $ErrMessage"; $ErrMessage = undef; } @@ -549,49 +549,46 @@ elsif (!defined $TAError) # Grab the test reports if any # -if ($Step->Type ne "build") +foreach my $Build (keys %{$TaskMissions->{Builds}}) { - foreach my $Build (keys %{$TaskMissions->{Builds}}) + my $RptFileName = "$Build.report"; + Debug(Elapsed($Start), " Retrieving '$RptFileName'\n"); + if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) { - my $RptFileName = "$Build.report"; - Debug(Elapsed($Start), " Retrieving '$RptFileName'\n"); - if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) - { - chmod 0664, "$TaskDir/$RptFileName"; + chmod 0664, "$TaskDir/$RptFileName"; - my ($TestUnitCount, $TimeoutCount, $LogFailures, $LogErrors) = ParseWineTestReport("$TaskDir/$RptFileName", 1, $TaskTimedOut); - $TaskTimedOut = 1 if ($TestUnitCount == $TimeoutCount); - if (!defined $LogFailures and @$LogErrors == 1) - { - # Could not open the file - $NewStatus = 'boterror'; - Error "Unable to open '$RptFileName' for reading: $!\n"; - LogTaskError("Unable to open '$RptFileName' for reading: $!\n"); - } - else - { - # $LogFailures can legitimately be undefined in case of a timeout - $TaskFailures += $LogFailures || 0; - if (@$LogErrors and open(my $Log, ">", "$TaskDir/$RptFileName.err")) - { - # Save the extra errors detected by ParseWineTestReport() in - # $RptFileName.err: - # - This keep the .report file clean. - # - Each .err file can be matched to its corresponding .report, even - # if there are multiple .report files in the directory. - # - The .err file can be moved to the latest directory next to the - # reference report. - print $Log "$_\n" for (@$LogErrors); - close($Log); - } - } - } - elsif (!defined $TAError and - $TA->GetLastError() !~ /: No such file or directory/) + my ($TestUnitCount, $TimeoutCount, $LogFailures, $LogErrors) = ParseWineTestReport("$TaskDir/$RptFileName", 1, $TaskTimedOut); + $TaskTimedOut = 1 if ($TestUnitCount == $TimeoutCount); + if (!defined $LogFailures and @$LogErrors == 1) { - $TAError = "An error occurred while retrieving $RptFileName: ". $TA->GetLastError(); + # Could not open the file $NewStatus = 'boterror'; + Error "Unable to open '$RptFileName' for reading: $!\n"; + LogTaskError("Unable to open '$RptFileName' for reading: $!\n"); } + else + { + # $LogFailures can legitimately be undefined in case of a timeout + $TaskFailures += $LogFailures || 0; + if (@$LogErrors and open(my $Log, ">", "$TaskDir/$RptFileName.err")) + { + # Save the extra errors detected by ParseWineTestReport() in + # $RptFileName.err: + # - This keep the .report file clean. + # - Each .err file can be matched to its corresponding .report, even + # if there are multiple .report files in the directory. + # - The .err file can be moved to the latest directory next to the + # reference report. + print $Log "$_\n" for (@$LogErrors); + close($Log); + } + } + } + elsif (!defined $TAError and + $TA->GetLastError() !~ /: No such file or directory/) + { + $TAError = "An error occurred while retrieving $RptFileName: ". $TA->GetLastError(); + $NewStatus = 'boterror'; } }

1 0

Francois Gouget : testbot/testagentd: Fix the SetTime() RPC on Unix.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: tools Branch: master Commit: 13300521cc65ccb137195cbdf8416e83e8a5d351 URL: https://source.winehq.org/git/tools.git/?a=commit;h=13300521cc65ccb137195cb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 30 03:41:51 2018 +0100 testbot/testagentd: Fix the SetTime() RPC on Unix. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/testagentd/platform_unix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/testagentd/platform_unix.c b/testbot/src/testagentd/platform_unix.c index 7a3a8f8..560d121 100644 --- a/testbot/src/testagentd/platform_unix.c +++ b/testbot/src/testagentd/platform_unix.c @@ -231,7 +231,7 @@ int platform_settime(uint64_t epoch, uint32_t leeway) tv.tv_sec = epoch; tv.tv_usec = 0; - if (!settimeofday(&tv, NULL)) + if (settimeofday(&tv, NULL)) { set_status(ST_ERROR, "failed to set the time: %s", strerror(errno)); return 0;

1 0

Alexandre Julliard : testbot: Fix a typo.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: tools Branch: master Commit: bc07efbfad4e99e79b5da212c88e0d56feefad64 URL: https://source.winehq.org/git/tools.git/?a=commit;h=bc07efbfad4e99e79b5da21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 30 09:22:28 2018 +0100 testbot: Fix a typo. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/WineTest.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 0b14b68..ecb3299 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -84,7 +84,7 @@ sub SetupTest($$) LogMsg "tests\n" if (!$InTests); $InTests = 1; - InfoMsg "\n$Running $Test in the $Mission->{Build} Wine\n"; + InfoMsg "\nRunning $Test in the $Mission->{Build} Wine\n"; SetupWineEnvironment($Mission->{Build}); }

1 0

Alistair Leslie-Hughes : setupapi: Fix broken control definition.
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: wine Branch: master Commit: 853351698842c92db62bddedd2f531b7c5e745d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=853351698842c92db62bdded… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 29 21:49:53 2018 +0000 setupapi: Fix broken control definition. Based on a patch by Mark Jansen. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/setupapi.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/setupapi.rc b/dlls/setupapi/setupapi.rc index c03f01f..f5da61f 100644 --- a/dlls/setupapi/setupapi.rc +++ b/dlls/setupapi/setupapi.rc @@ -43,7 +43,7 @@ BEGIN LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "Destination:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "", PROGRESSORD, "setupx_progress", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 63, 194, 13 END IDPROMPTFORDISK DIALOG 0, 0, 260, 120

1 0

Michael Stefaniuc : cmd: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: wine Branch: master Commit: a46f311f3fc23623f9141eac2f230b9b7adf333a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a46f311f3fc23623f9141eac… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 29 20:10:41 2018 +0100 cmd: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/wcmdmain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 5ef4a2b..1c99661 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2419,9 +2419,9 @@ int wmain (int argc, WCHAR *argvW[]) OSVERSIONINFOW osv; char osver[50]; - if (!GetEnvironmentVariableW(comspecW, comspec, sizeof(comspec)/sizeof(WCHAR))) + if (!GetEnvironmentVariableW(comspecW, comspec, ARRAY_SIZE(comspec))) { - GetSystemDirectoryW(comspec, (sizeof(comspec) - sizeof(cmdW))/sizeof(WCHAR)); + GetSystemDirectoryW(comspec, ARRAY_SIZE(comspec) - ARRAY_SIZE(cmdW)); strcatW(comspec, cmdW); SetEnvironmentVariableW(comspecW, comspec); }

1 0

Michael Stefaniuc : winecfg: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: wine Branch: master Commit: f051aa6774194689b1ab6aaba3b9c22be902d6ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=f051aa6774194689b1ab6aab… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 29 20:10:42 2018 +0100 winecfg: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/driveui.c | 2 +- programs/winecfg/theme.c | 12 +++++------- programs/winecfg/winecfg.c | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index c25e71d..36ae88c 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -440,7 +440,7 @@ static void update_controls(HWND dialog) type = current_drive->type; SendDlgItemMessageW(dialog, IDC_COMBO_TYPE, CB_RESETCONTENT, 0, 0); - for (i = 0; i < sizeof(type_pairs) / sizeof(struct drive_typemap); i++) + for (i = 0; i < ARRAY_SIZE(type_pairs); i++) { WCHAR driveDesc[64]; LoadStringW(GetModuleHandleW(NULL), type_pairs[i].idDesc, driveDesc, ARRAY_SIZE(driveDesc)); diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 5304f72..78d89a5 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -635,7 +635,7 @@ static void on_theme_install(HWND dialog) ofn.nFilterIndex = 0; ofn.lpstrFile = file; ofn.lpstrFile[0] = '\0'; - ofn.nMaxFile = sizeof(file)/sizeof(filetitle[0]); + ofn.nMaxFile = ARRAY_SIZE(file); ofn.lpstrFileTitle = filetitle; ofn.lpstrFileTitle[0] = '\0'; ofn.nMaxFileTitle = ARRAY_SIZE(filetitle); @@ -729,8 +729,6 @@ static struct ShellFolderInfo asfiInfo[] = { static struct ShellFolderInfo *psfiSelected = NULL; -#define NUM_ELEMS(x) (sizeof(x)/sizeof(*(x))) - static void init_shell_folder_listview_headers(HWND dialog) { LVCOLUMNW listColumn; RECT viewRect; @@ -763,8 +761,8 @@ static void read_shell_folder_link_targets(void) { WCHAR wszPath[MAX_PATH]; HRESULT hr; int i; - - for (i=0; i<NUM_ELEMS(asfiInfo); i++) { + + for (i=0; i<ARRAY_SIZE(asfiInfo); i++) { asfiInfo[i].szLinkTarget[0] = '\0'; hr = SHGetFolderPathW(NULL, asfiInfo[i].nFolder|CSIDL_FLAG_DONT_VERIFY, NULL, SHGFP_TYPE_CURRENT, wszPath); @@ -790,7 +788,7 @@ static void update_shell_folder_listview(HWND dialog) { SendDlgItemMessageW(dialog, IDC_LIST_SFPATHS, LVM_DELETEALLITEMS, 0, 0); - for (i=0; i<NUM_ELEMS(asfiInfo); i++) { + for (i=0; i<ARRAY_SIZE(asfiInfo); i++) { WCHAR buffer[MAX_PATH]; HRESULT hr; LPITEMIDLIST pidlCurrent; @@ -905,7 +903,7 @@ static void apply_shell_folder_changes(void) { struct stat statPath; HRESULT hr; - for (i=0; i<NUM_ELEMS(asfiInfo); i++) { + for (i=0; i<ARRAY_SIZE(asfiInfo); i++) { /* Ignore nonexistent link targets */ if (asfiInfo[i].szLinkTarget[0] && stat(asfiInfo[i].szLinkTarget, &statPath)) continue; diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index be04ba2..c4c05bd 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -623,7 +623,7 @@ static void process_setting(struct setting *s) static const WCHAR softwareW[] = {'S','o','f','t','w','a','r','e','\\'}; HKEY key; BOOL needs_wow64 = (is_win64 && s->root == HKEY_LOCAL_MACHINE && s->path && - !strncmpiW( s->path, softwareW, sizeof(softwareW)/sizeof(WCHAR) )); + !strncmpiW(s->path, softwareW, ARRAY_SIZE(softwareW))); if (s->value) {

1 0

Jacek Caban : server: Use a separated object for each opened named pipe device file.
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: wine Branch: master Commit: 2600ecd4edfdb71097105c74312f83845305a4f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2600ecd4edfdb71097105c74… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 29 15:49:47 2018 +0100 server: Use a separated object for each opened named pipe device file. Allows using proper options for ioctl pseudo fd. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 16 +++--- dlls/ntdll/tests/file.c | 2 +- server/named_pipe.c | 118 ++++++++++++++++++++++++++++++----------- 3 files changed, 94 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2600ecd4edfdb7109710…

1 0

Jacek Caban : server: Use requested options for device pseudo fd.
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: wine Branch: master Commit: f003ac5e62d984db0507506d5c0dc059505c328b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f003ac5e62d984db0507506d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 29 15:48:44 2018 +0100 server: Use requested options for device pseudo fd. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 2 +- server/device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 076d6bf..e84324c 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3578,7 +3578,7 @@ static void test_file_mode(void) { &mailslot_dev_name, 0, 0 }, { &mailslot_dev_name, FILE_SYNCHRONOUS_IO_ALERT, FILE_SYNCHRONOUS_IO_ALERT, TRUE }, { &mountmgr_dev_name, 0, 0 }, - { &mountmgr_dev_name, FILE_SYNCHRONOUS_IO_ALERT, FILE_SYNCHRONOUS_IO_ALERT, TRUE } + { &mountmgr_dev_name, FILE_SYNCHRONOUS_IO_ALERT, FILE_SYNCHRONOUS_IO_ALERT } }; static WCHAR pipe_devW[] = {'\\','?','?','\\','P','I','P','E','\\'}; diff --git a/server/device.c b/server/device.c index 081fd2d..ac7d88f 100644 --- a/server/device.c +++ b/server/device.c @@ -358,7 +358,7 @@ static struct object *device_open_file( struct object *obj, unsigned int access, &mode, access, sharing, options ); if (file->fd) set_fd_user( file->fd, &device_file_fd_ops, &file->obj ); } - else file->fd = alloc_pseudo_fd( &device_file_fd_ops, &file->obj, 0 ); + else file->fd = alloc_pseudo_fd( &device_file_fd_ops, &file->obj, options ); if (!file->fd) {

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
61
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 October 2018