wine-devel March 2018

wine-devel@winehq.org

90 participants
798 discussions

[PATCH 2/2] advapi32: Initialize more fields in LsaQueryInformationPolicy(PolicyDnsDomainInformation).
by Dmitry Timoshkov 01 Mar '18

01 Mar '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/tests/sysinfo.c | 7 +++---- dlls/advapi32/lsa.c | 36 +++++++++++++++++++++++++++++------- 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/adsldp/tests/sysinfo.c b/dlls/adsldp/tests/sysinfo.c index 1e3939f0db..09f2484b7b 100644 --- a/dlls/adsldp/tests/sysinfo.c +++ b/dlls/adsldp/tests/sysinfo.c @@ -160,9 +160,8 @@ static void test_sysinfo(void) ok(hr == S_OK, "got %#x\n", hr); IDispatch_Release(dispatch); - hr = IADsADSystemInfo_get_UserName(sysinfo, &bstr); -todo_wine - ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_NONE_MAPPED), "got %#x\n", hr); + hr = IADsADSystemInfo_get_ComputerName(sysinfo, &bstr); + ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_CANT_ACCESS_DOMAIN_INFO), "got %#x\n", hr); if (hr != S_OK) { skip("Computer is not part of a domain, skipping the tests\n"); @@ -171,7 +170,7 @@ todo_wine } SysFreeString(bstr); - hr = IADsADSystemInfo_get_ComputerName(sysinfo, &bstr); + hr = IADsADSystemInfo_get_UserName(sysinfo, &bstr); ok(hr == S_OK, "got %#x\n", hr); if (hr == S_OK) SysFreeString(bstr); diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index bfd879bbc7..6f51f9df57 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -763,16 +763,38 @@ NTSTATUS WINAPI LsaQueryInformationPolicy( break; case PolicyDnsDomainInformation: /* 12 (0xc) */ { - /* Only the domain name is valid for the local computer. - * All other fields are zero. - */ - PPOLICY_DNS_DOMAIN_INFO pinfo; + struct di + { + POLICY_DNS_DOMAIN_INFO info; + SID sid; + WCHAR domain_name[MAX_COMPUTERNAME_LENGTH + 1]; + WCHAR dns_domain_name[MAX_COMPUTERNAME_LENGTH + 1]; + WCHAR dns_forest_name[MAX_COMPUTERNAME_LENGTH + 1]; + }; + DWORD dwSize; + struct di *xdi; - pinfo = ADVAPI_GetDomainName(sizeof(*pinfo), offsetof(POLICY_DNS_DOMAIN_INFO, Name)); + xdi = heap_alloc_zero(sizeof(*xdi)); + if (!xdi) return STATUS_NO_MEMORY; - TRACE("setting domain to %s\n", debugstr_w(pinfo->Name.Buffer)); + dwSize = MAX_COMPUTERNAME_LENGTH + 1; + if (GetComputerNameW(xdi->domain_name, &dwSize)) + { + xdi->info.Name.Buffer = xdi->domain_name; + xdi->info.Name.Length = dwSize * sizeof(WCHAR); + xdi->info.Name.MaximumLength = (dwSize + 1) * sizeof(WCHAR); + TRACE("setting Name to %s\n", debugstr_w(xdi->info.Name.Buffer)); + } - *Buffer = pinfo; + /* FIXME: also set DnsDomainName and DnsForestName */ + + if (ADVAPI_GetComputerSid(&xdi->sid)) + { + xdi->info.Sid = &xdi->sid; + TRACE("setting SID to %s\n", debugstr_sid(&xdi->sid)); + } + + *Buffer = xdi; } break; case PolicyAuditLogInformation: -- 2.16.2

1 0

[PATCH 1/2] secur32: Fix GetComputerObjectNameW for the cases of NULL or insufficient buffer size.
by Dmitry Timoshkov 01 Mar '18

01 Mar '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/secur32.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 4408e7cf83..889883c2bd 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -996,29 +996,21 @@ BOOLEAN WINAPI GetComputerObjectNameW( if (GetComputerNameW(name, &size)) { DWORD len = domainInfo->Name.Length + size + 3; - if (lpNameBuffer) + if (lpNameBuffer && *nSize >= len) { - if (*nSize < len) - { - *nSize = len; - SetLastError(ERROR_INSUFFICIENT_BUFFER); - status = FALSE; - } - else - { - WCHAR bs[] = { '\\', 0 }; - WCHAR ds[] = { '$', 0 }; - lstrcpyW(lpNameBuffer, domainInfo->Name.Buffer); - lstrcatW(lpNameBuffer, bs); - lstrcatW(lpNameBuffer, name); - lstrcatW(lpNameBuffer, ds); - status = TRUE; - } + WCHAR bs[] = { '\\', 0 }; + WCHAR ds[] = { '$', 0 }; + lstrcpyW(lpNameBuffer, domainInfo->Name.Buffer); + lstrcatW(lpNameBuffer, bs); + lstrcatW(lpNameBuffer, name); + lstrcatW(lpNameBuffer, ds); + status = TRUE; } else /* just requesting length required */ { *nSize = len; - status = TRUE; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + status = FALSE; } } else -- 2.16.2

1 0

[PATCH 4/5] wined3d: Explicitly calculate the sub-resource level in surface_load_texture().
by Henri Verbeet 01 Mar '18

01 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a339171..c82da87 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2269,7 +2269,7 @@ static BOOL surface_load_drawable(struct wined3d_surface *surface, static BOOL surface_load_texture(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) { - unsigned int width, height, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch; + unsigned int width, height, level, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch; unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_texture *texture = surface->container; @@ -2295,8 +2295,9 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, return TRUE; } - width = wined3d_texture_get_level_width(texture, surface->texture_level); - height = wined3d_texture_get_level_height(texture, surface->texture_level); + level = sub_resource_idx % texture->level_count; + width = wined3d_texture_get_level_width(texture, level); + height = wined3d_texture_get_level_height(texture, level); SetRect(&src_rect, 0, 0, width, height); if (!depth && sub_resource->locations & (WINED3D_LOCATION_TEXTURE_SRGB | WINED3D_LOCATION_TEXTURE_RGB) @@ -2360,7 +2361,7 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, wined3d_texture_prepare_texture(texture, context, srgb); wined3d_texture_bind_and_dirtify(texture, context, srgb); - wined3d_texture_get_pitch(texture, surface->texture_level, &src_row_pitch, &src_slice_pitch); + wined3d_texture_get_pitch(texture, level, &src_row_pitch, &src_slice_pitch); format = *texture->resource.format; if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE))) -- 2.1.4

1 0

[PATCH 3/5] wined3d: Explicitly calculate the sub-resource level in surface_load_drawable().
by Henri Verbeet 01 Mar '18

01 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b6235ce..a339171 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2226,6 +2226,7 @@ static BOOL surface_load_drawable(struct wined3d_surface *surface, struct wined3d_texture *texture = surface->container; struct wined3d_surface *restore_rt = NULL; struct wined3d_device *device; + unsigned int level; RECT r; if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) @@ -2250,8 +2251,9 @@ static BOOL surface_load_drawable(struct wined3d_surface *surface, else restore_rt = NULL; - SetRect(&r, 0, 0, wined3d_texture_get_level_width(texture, surface->texture_level), - wined3d_texture_get_level_height(texture, surface->texture_level)); + level = sub_resource_idx % texture->level_count; + SetRect(&r, 0, 0, wined3d_texture_get_level_width(texture, level), + wined3d_texture_get_level_height(texture, level)); wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); device->blitter->ops->blitter_blit(device->blitter, WINED3D_BLIT_OP_COLOR_BLIT, context, surface, WINED3D_LOCATION_TEXTURE_RGB, &r, -- 2.1.4

1 0

[PATCH 2/5] wined3d: Explicitly calculate the sub-resource level in surface_blt_special().
by Henri Verbeet 01 Mar '18

01 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 668cfba..b6235ce 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2113,7 +2113,7 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE if ((src_swapchain || src_surface == rt) && !dst_swapchain) { - unsigned int src_width, src_height; + unsigned int src_level, src_width, src_height; /* Blit from render target to texture */ BOOL stretchx; @@ -2147,8 +2147,9 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE * back buffer. This is slower than reading line per line, thus not used for flipping * -> If the app wants a scaled image with a dest rect that is bigger than the fb, it has to be copied * pixel by pixel. */ - src_width = wined3d_texture_get_level_width(src_texture, src_surface->texture_level); - src_height = wined3d_texture_get_level_height(src_texture, src_surface->texture_level); + src_level = surface_get_sub_resource_idx(src_surface) % src_texture->level_count; + src_width = wined3d_texture_get_level_width(src_texture, src_level); + src_height = wined3d_texture_get_level_height(src_texture, src_level); if (!stretchx || dst_rect->right - dst_rect->left > src_width || dst_rect->bottom - dst_rect->top > src_height) { -- 2.1.4

1 0

[PATCH 1/5] wined3d: Explicitly calculate the sub-resource level in fb_copy_to_texture_direct().
by Henri Verbeet 01 Mar '18

01 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- 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 12370ed..668cfba 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1722,9 +1722,9 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, struct wined3d_surface *src_surface, const RECT *src_rect, const RECT *dst_rect_in, enum wined3d_texture_filter_type filter) { + unsigned int src_width, src_height, src_pow2_width, src_pow2_height, src_level; unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); - unsigned int src_width, src_height, src_pow2_width, src_pow2_height; struct wined3d_texture *src_texture = src_surface->container; struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_device *device = dst_texture->resource.device; @@ -1752,10 +1752,11 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st wined3d_texture_load(dst_texture, context, FALSE); offscreen_buffer = context_get_offscreen_gl_buffer(context); - src_width = wined3d_texture_get_level_width(src_texture, src_surface->texture_level); - src_height = wined3d_texture_get_level_height(src_texture, src_surface->texture_level); - src_pow2_width = wined3d_texture_get_level_pow2_width(src_texture, src_surface->texture_level); - src_pow2_height = wined3d_texture_get_level_pow2_height(src_texture, src_surface->texture_level); + src_level = src_sub_resource_idx % src_texture->level_count; + src_width = wined3d_texture_get_level_width(src_texture, src_level); + src_height = wined3d_texture_get_level_height(src_texture, src_level); + src_pow2_width = wined3d_texture_get_level_pow2_width(src_texture, src_level); + src_pow2_height = wined3d_texture_get_level_pow2_height(src_texture, src_level); src_offscreen = wined3d_resource_is_offscreen(&src_texture->resource); noBackBufferBackup = src_offscreen && wined3d_settings.offscreen_rendering_mode == ORM_FBO; -- 2.1.4

1 0

[PATCH] fonts/tahoma.sfd: Add glyphs U+FB01 and U+FB02.
by Zebediah Figura 01 Mar '18

01 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- fonts/tahoma.sfd | 16 ++++++++++++++++ fonts/tahoma.ttf | Bin 143652 -> 143884 bytes 2 files changed, 16 insertions(+) diff --git a/fonts/tahoma.sfd b/fonts/tahoma.sfd index 3d6b44e..466f250 100644 --- a/fonts/tahoma.sfd +++ b/fonts/tahoma.sfd @@ -24398,6 +24398,10 @@ BDFChar: 252 8364 7 0 5 0 8 4@"GpJGap_49,?] BDFChar: 253 8482 11 1 9 5 8 k^ZBX8q9H_ +BDFChar: 266 64257 6 0 5 0 9 +0LS1u6psF26pq"T +BDFChar: 267 64258 6 0 5 0 9 +1djb(6psF26pq"T BDFChar: 280 278 7 0 5 0 10 &-2WYJ:RQJJ:ROt BDFChar: 306 279 6 0 5 0 8 @@ -25127,6 +25131,10 @@ BDFChar: 252 8364 7 0 5 0 8 4@"GpJGap_49,?] BDFChar: 253 8482 11 1 9 5 8 k^ZBX8q9H_ +BDFChar: 266 64257 7 0 5 0 9 +0LS1u6psF26pq"T +BDFChar: 267 64258 7 0 5 0 9 +1djb(6psF26pq"T BDFChar: 280 278 7 1 6 0 11 0JEM)J:RQJJ:N1J BDFChar: 306 279 7 0 5 0 8 @@ -25856,6 +25864,10 @@ BDFChar: 252 8364 8 0 6 0 10 *$RXur.+]q5U%0J BDFChar: 253 8482 13 0 11 6 10 q@Fl*,1%O\+qO_S +BDFChar: 266 64257 8 0 6 0 11 +3'okqnj5Z06:+"* +BDFChar: 267 64258 8 0 6 0 11 +3^Q/"nj5Z06:+"* BDFChar: 280 278 8 1 7 0 12 &-2][J:RWLJ:N0#rVuou BDFChar: 306 279 8 0 6 0 10 @@ -26585,6 +26597,10 @@ BDFChar: 252 8364 9 0 7 0 11 %M9gK5lO%J5TgXK BDFChar: 253 8482 14 1 12 7 11 q@Fl*,1%O\+qO_S +BDFChar: 266 64257 9 0 6 0 12 +3'oqsnj5Z06:+"*63$uc +BDFChar: 267 64258 8 0 6 0 12 +3^Q/"nj5Z06:+"*63$uc BDFChar: 280 278 9 1 8 0 14 (`38QJ:N0#s+#WMJ:RY" BDFChar: 306 279 8 0 6 0 11 diff --git a/fonts/tahoma.ttf b/fonts/tahoma.ttf index 4f68d1edfa825a0b27e0f41932867b768157a7a7..8bee8ad35c8e8b1f71b97c8117e1c57282b233ce 100644 GIT binary patch delta 1779 zcmd6nO-NKx6vxlG+RQl3G^0+A<3}^2gN~-7_F;n&h2;k^l0pk{HqFqYFvTD@eK3|8 zfk8^pE6gwmDr_;;;sv_si!=~&B?&F0f^bn;gt`#w-1pA-1#QDS-1&2U=e+mMz5n~( z{ZFQAUrc=-f6}qR7l5rnfZo}f>d?VqTRZ@`-~*_dsI5KP000Q0V(v-31(UxG_Mhl( zMztBSYQ$wWfZ0&t*jM9ds<CUqZpQ@~sQsf@Y1i_`)p=tg|8@eW)7=&$SWLklVe>cM ztL`z|wYaLs?ABxT?hINpd{!e^Q-VEau5x%JFs+n1JOIk@JWg)<K)t3ZT?^<=jan>- z00oBt3_6Z$*lLxyG-nylXxL_xc<1kBY+pn-M%D5~{E-{$13^E4AxMT-q;VL7ae$=f z@E#^fCtw;rlFq<S_(i&eh*Y0!$IWOV^<gTekp|I;F47QgLl5b3%)<iG^XNxE=^ZS^ zQqsp*hPOyZ#a<Bt+T#up5mD;xjXIPe_84Mx^QIPRL=G#>EV79DhyT>*;eU0y(x^N$ z)Z`i2Aq@k^XZ3J7?ou!33S&~NgSm|~Td!^DWtK{s%j_YuEu>jAY1d#E=g0wVnCU-_ z*>`5?q<K0E+nGtt(OE{ggyE_N!gY$rE1a&=oLYINwzlwXrO_+g-YHJ=62pl$jQqII zYM)m;MG;B9Su6^b)_mcY{zV?~bsO2g$m_L>i@aMGzgG|V$iJd7=5)%zqc8l_S7r`U z-ut!`rK3<}$LcvHtxDI++rrG~1%d6%t}v7Kd6_+6w)(b-wsZzi$+dshTo15A=c2tr zvG~cmbDU@I+Ang<-nCy<Lw@lLaf+-vB3<ho;0k$o<U%*%Th}?Vc3GV-*TrM%Qn7Sx zk$EO*k-jyTyv&@W1<dM{l7PrQd7V@8#Ab3T;RbzBp@NzG-pa9+rjOZ@MgZh(3w73= z&rE+jz<%aYB_0q?98kss<k2iwu_xVg>*58~R3<%|S4PW4gHwAqdlTnTemnAL;*EY+ F=3lPT_%r|j delta 1605 zcmd6n-AmI^7{{OIxVBMSx>;#Cb(^xyx7G@K(TgBUB__Q|i4)SB5^_SA*P~XTBqj9n z6Y`>$UF^b(%J6rQR}o}XxQhY<AqlS{2s3mPLC^V}XKVQn<TDOm&gVSmcb;>;=WJxr zn)qxTbq9V954Qqd*bi`h;K-qH(}Qa>Uci+JfQGK-=JqxKKoBA8lU5s=oM%U-;vJ}W zAT~VLC#JE!K>zg?=L+@Z1+;C`DpoPIVVb5mwDc;LJHj>_B7iRdU{*Mgme_8WxOOp% zI}DtkFY%uHSv*7-!+J7}-%4XcAm|4$1}1nxnuJ#{1CaL^W+6rT5<bE_=^QM<chVn- zNcko!ZbBQW3mxbr-GxQCo%Ar4p_{Y|z33yogaM>NO}DWQ>qrwA#4*xmqEUnagt=FD z7m0o57}W^>v6!8*8gs9-1>i&{6(hsU{cfZ8w|`D|mkCQ=)oJGWq$Mi1^CB|`X(_WC z+HsF4iOB<&v5}gShu#|mppcaAh+MvNg;@cqOR)$YvJp8;Md(0t7(g}Wo?*V3bO*J7 z;vy2$zIsHtN8TD4yuC=KE(_0pt=D?RQxx4_w1o<BY+ZTNb5qrxDZb~<n*KdKT}j@= zZZVe!=T;l*n`E|yln=Y_12gHDn_7t4L6sksc`~G7h0Od00ifFsHOx*jlO}o;i$w<* z<}4P?6ss7(UjD$Fe?9=PoB40%Y7+qU)Ni78RE_ty@Hji!FaKF&SioXjrT%u^R3#=6 zA4(_v+NWv}SXXuqo>v8D>>P})=@00s8u`=`%!^5@)b208V^&1!W43%ZNH49CN9?4< zYUIi(W-ihYv#ZRul2$THGLv8RGn-|mR?l9LxO`zU)O>&gDqqA~wDBOlw2a^Uvf|?^ Xo%}KEi9gckgUX)KkZ9AELZajkYSh%W -- 2.7.4

1 0

[PATCH] ntdll: Implement ProcessPriorityClass in NtQueryInformationProcess.
by Zebediah Figura 01 Mar '18

01 Mar '18

From: Michael Müller <michael(a)fds-team.de> Allows Process Hacker to show process priority. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/process.c | 29 ++++++++++++++++++++++++++++- dlls/ntdll/tests/info.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 40034b4..835d7e6 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -205,7 +205,6 @@ NTSTATUS WINAPI NtQueryInformationProcess( UNIMPLEMENTED_INFO_CLASS(ProcessWorkingSetWatch); UNIMPLEMENTED_INFO_CLASS(ProcessUserModeIOPL); UNIMPLEMENTED_INFO_CLASS(ProcessEnableAlignmentFaultFixup); - UNIMPLEMENTED_INFO_CLASS(ProcessPriorityClass); UNIMPLEMENTED_INFO_CLASS(ProcessWx86Information); UNIMPLEMENTED_INFO_CLASS(ProcessPriorityBoost); UNIMPLEMENTED_INFO_CLASS(ProcessDeviceMap); @@ -545,6 +544,34 @@ NTSTATUS WINAPI NtQueryInformationProcess( else ret = STATUS_INFO_LENGTH_MISMATCH; break; + case ProcessPriorityClass: + len = sizeof(PROCESS_PRIORITY_CLASS); + if (ProcessInformationLength == len) + { + if (!ProcessInformation) + ret = STATUS_ACCESS_VIOLATION; + else if (!ProcessHandle) + ret = STATUS_INVALID_HANDLE; + else + { + PROCESS_PRIORITY_CLASS *priority = ProcessInformation; + + SERVER_START_REQ(get_process_info) + { + req->handle = wine_server_obj_handle( ProcessHandle ); + if ((ret = wine_server_call( req )) == STATUS_SUCCESS) + { + priority->PriorityClass = reply->priority; + /* FIXME: Not yet supported by the wineserver */ + priority->Foreground = FALSE; + } + } + SERVER_END_REQ; + } + } + else + ret = STATUS_INFO_LENGTH_MISMATCH; + break; default: FIXME("(%p,info_class=%d,%p,0x%08x,%p) Unknown information class\n", ProcessHandle,ProcessInformationClass, diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 1f1c675..54321e5 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1334,6 +1334,40 @@ static void test_query_process_debug_port(int argc, char **argv) ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); } +static void test_query_process_priority(void) +{ + PROCESS_PRIORITY_CLASS priority[2]; + ULONG ReturnLength; + DWORD orig_priority; + NTSTATUS status; + BOOL ret; + + status = pNtQueryInformationProcess(NULL, ProcessPriorityClass, NULL, sizeof(priority[0]), NULL); + ok(status == STATUS_ACCESS_VIOLATION || broken(status == STATUS_INVALID_HANDLE) /* w2k3 */, + "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status); + + status = pNtQueryInformationProcess(NULL, ProcessPriorityClass, &priority, sizeof(priority[0]), NULL); + ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status); + + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessPriorityClass, &priority, 1, &ReturnLength); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessPriorityClass, &priority, sizeof(priority), &ReturnLength); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + + orig_priority = GetPriorityClass(GetCurrentProcess()); + ret = SetPriorityClass(GetCurrentProcess(), BELOW_NORMAL_PRIORITY_CLASS); + ok(ret, "Failed to set priority class: %u\n", GetLastError()); + + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessPriorityClass, &priority, sizeof(priority[0]), &ReturnLength); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok(priority[0].PriorityClass == PROCESS_PRIOCLASS_BELOW_NORMAL, + "Expected PROCESS_PRIOCLASS_BELOW_NORMAL, got %u\n", priority[0].PriorityClass); + + ret = SetPriorityClass(GetCurrentProcess(), orig_priority); + ok(ret, "Failed to reset priority class: %u\n", GetLastError()); +} + static void test_query_process_handlecount(void) { NTSTATUS status; @@ -2192,6 +2226,10 @@ START_TEST(info) trace("Starting test_process_debug_port()\n"); test_query_process_debug_port(argc, argv); + /* 0x12 ProcessPriorityClass */ + trace("Starting test_query_process_priority()\n"); + test_query_process_priority(); + /* 0x14 ProcessHandleCount */ trace("Starting test_query_process_handlecount()\n"); test_query_process_handlecount(); -- 2.7.4

1 0

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-devel March 2018