May 2019 - Wine-commits - list.winehq.org

Józef Kucia : vkd3d-shader: Clear output register status while leaving control point phase.
by Alexandre Julliard 14 May '19

14 May '19

Module: vkd3d Branch: master Commit: f0530d92b82c727e82a6781f3d9d7d04693ccd0f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f0530d92b82c727e82a6781… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 14 13:27:40 2019 +0200 vkd3d-shader: Clear output register status while leaving control point phase. We need to clear output register status when epilogue function isn't used. 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 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 18e10ad..5477efd 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4474,10 +4474,6 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ vkd3d_spirv_build_op_return(&compiler->spirv_builder); vkd3d_spirv_build_op_function_end(builder); - /* Fork and join phases share output registers (patch constants). */ - if (!phase || is_control_point_phase(phase)) - memset(compiler->output_info, 0, signature->element_count * sizeof(*compiler->output_info)); - memset(compiler->private_output_variable, 0, sizeof(compiler->private_output_variable)); memset(compiler->private_output_variable_write_mask, 0, sizeof(compiler->private_output_variable_write_mask)); compiler->epilogue_function_id = 0; @@ -5443,6 +5439,12 @@ static void vkd3d_dxbc_compiler_leave_shader_phase(struct vkd3d_dxbc_compiler *c memset(&reg, 0, sizeof(reg)); reg.idx[1].offset = ~0u; + /* Fork and join phases share output registers (patch constants). + * Control point phase has separate output registers. */ + memset(compiler->output_info, 0, signature->element_count * sizeof(*compiler->output_info)); + memset(compiler->private_output_variable, 0, sizeof(compiler->private_output_variable)); + memset(compiler->private_output_variable_write_mask, 0, sizeof(compiler->private_output_variable_write_mask)); + for (i = 0; i < signature->element_count; ++i) { const struct vkd3d_shader_signature_element *e = &signature->elements[i];

1 0

Józef Kucia : vkd3d-shader: Handle interpolation mode in vkd3d_dxbc_compiler_emit_input().
by Alexandre Julliard 14 May '19

14 May '19

Module: vkd3d Branch: master Commit: 267f10df8b0b541893c013215ee26c95a7447c1b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=267f10df8b0b541893c0132… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 14 13:27:41 2019 +0200 vkd3d-shader: Handle interpolation mode in vkd3d_dxbc_compiler_emit_input(). 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 | 79 ++++++++++++++++---------------- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 5477efd..f85db11 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3330,6 +3330,36 @@ static void vkd3d_dxbc_compiler_decorate_builtin(struct vkd3d_dxbc_compiler *com vkd3d_spirv_build_op_decorate1(builder, target_id, SpvDecorationBuiltIn, builtin); } +static void vkd3d_dxbc_compiler_emit_interpolation_decorations(struct vkd3d_dxbc_compiler *compiler, + uint32_t id, enum vkd3d_shader_interpolation_mode mode) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + + switch (mode) + { + case VKD3DSIM_NONE: + break; + case VKD3DSIM_CONSTANT: + vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationFlat, NULL, 0); + break; + case VKD3DSIM_LINEAR: + break; + case VKD3DSIM_LINEAR_CENTROID: + vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationCentroid, NULL, 0); + break; + case VKD3DSIM_LINEAR_NOPERSPECTIVE: + vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationNoPerspective, NULL, 0); + break; + case VKD3DSIM_LINEAR_SAMPLE: + vkd3d_spirv_enable_capability(builder, SpvCapabilitySampleRateShading); + vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationSample, NULL, 0); + break; + default: + FIXME("Unhandled interpolation mode %#x.\n", mode); + break; + } +} + static uint32_t vkd3d_dxbc_compiler_emit_int_to_bool(struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_conditional_op condition, unsigned int component_count, uint32_t val_id) { @@ -3768,7 +3798,8 @@ static bool needs_private_io_variable(const struct vkd3d_shader_signature *signa } static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval) + const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval, + enum vkd3d_shader_interpolation_mode interpolation_mode) { unsigned int component_idx, component_count, input_component_count; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; @@ -3857,6 +3888,8 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationLocation, reg_idx); if (component_idx) vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationComponent, component_idx); + + vkd3d_dxbc_compiler_emit_interpolation_decorations(compiler, input_id, interpolation_mode); } if (reg->type == VKD3DSPR_PATCHCONST) @@ -3961,7 +3994,7 @@ static void vkd3d_dxbc_compiler_emit_shader_phase_input(struct vkd3d_dxbc_compil switch (reg->type) { case VKD3DSPR_INPUT: - vkd3d_dxbc_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE); + vkd3d_dxbc_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE, VKD3DSIM_NONE); return; case VKD3DSPR_OUTPOINTID: case VKD3DSPR_PRIMID: @@ -5089,64 +5122,30 @@ static void vkd3d_dxbc_compiler_emit_dcl_input(struct vkd3d_dxbc_compiler *compi if ((phase = vkd3d_dxbc_compiler_get_current_shader_phase(compiler))) vkd3d_dxbc_compiler_emit_shader_phase_input(compiler, phase, dst); else if (vkd3d_shader_register_is_input(&dst->reg) || dst->reg.type == VKD3DSPR_PATCHCONST) - vkd3d_dxbc_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE); + vkd3d_dxbc_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE, VKD3DSIM_NONE); else vkd3d_dxbc_compiler_emit_input_register(compiler, dst); } -static void vkd3d_dxbc_compiler_emit_interpolation_decorations(struct vkd3d_dxbc_compiler *compiler, - uint32_t id, enum vkd3d_shader_interpolation_mode mode) -{ - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - - switch (mode) - { - case VKD3DSIM_CONSTANT: - vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationFlat, NULL, 0); - break; - case VKD3DSIM_LINEAR: - break; - case VKD3DSIM_LINEAR_CENTROID: - vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationCentroid, NULL, 0); - break; - case VKD3DSIM_LINEAR_NOPERSPECTIVE: - vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationNoPerspective, NULL, 0); - break; - case VKD3DSIM_LINEAR_SAMPLE: - vkd3d_spirv_enable_capability(builder, SpvCapabilitySampleRateShading); - vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationSample, NULL, 0); - break; - default: - FIXME("Unhandled interpolation mode %#x.\n", mode); - break; - } -} - static void vkd3d_dxbc_compiler_emit_dcl_input_ps(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - uint32_t input_id; - - if ((input_id = vkd3d_dxbc_compiler_emit_input(compiler, &instruction->declaration.dst, VKD3D_SIV_NONE))) - vkd3d_dxbc_compiler_emit_interpolation_decorations(compiler, input_id, instruction->flags); + vkd3d_dxbc_compiler_emit_input(compiler, &instruction->declaration.dst, VKD3D_SIV_NONE, instruction->flags); } static void vkd3d_dxbc_compiler_emit_dcl_input_ps_sysval(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { const struct vkd3d_shader_register_semantic *semantic = &instruction->declaration.register_semantic; - uint32_t input_id; - input_id = vkd3d_dxbc_compiler_emit_input(compiler, &semantic->reg, semantic->sysval_semantic); - if (input_id && !semantic->sysval_semantic) - vkd3d_dxbc_compiler_emit_interpolation_decorations(compiler, input_id, instruction->flags); + vkd3d_dxbc_compiler_emit_input(compiler, &semantic->reg, semantic->sysval_semantic, instruction->flags); } static void vkd3d_dxbc_compiler_emit_dcl_input_sysval(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { vkd3d_dxbc_compiler_emit_input(compiler, &instruction->declaration.register_semantic.reg, - instruction->declaration.register_semantic.sysval_semantic); + instruction->declaration.register_semantic.sysval_semantic, VKD3DSIM_NONE); } static void vkd3d_dxbc_compiler_emit_dcl_output(struct vkd3d_dxbc_compiler *compiler, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 54d0705..47764e5 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -430,6 +430,7 @@ enum vkd3d_shader_dst_modifier enum vkd3d_shader_interpolation_mode { + VKD3DSIM_NONE = 0, VKD3DSIM_CONSTANT = 1, VKD3DSIM_LINEAR = 2, VKD3DSIM_LINEAR_CENTROID = 3,

1 0

Jeremy Newman : update for 2019
by Jeremy Newman 14 May '19

14 May '19

Module: website Branch: master Commit: 9eb8ac50822012132224a6b484974919e42d3a19 URL: https://source.winehq.org/git/website.git/?a=commit;h=9eb8ac50822012132224a… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue May 14 10:11:11 2019 -0500 update for 2019 --- templates/en/wineconf/rsvp.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/en/wineconf/rsvp.template b/templates/en/wineconf/rsvp.template index 59bbeb7..207aa2c 100644 --- a/templates/en/wineconf/rsvp.template +++ b/templates/en/wineconf/rsvp.template @@ -1,3 +1,3 @@  -<iframe src="https://docs.google.com/forms/d/e/1FAIpQLSebJ5QBhB7SRn2e9qB7FdDrrqGZykdb4bU…" width="90%" height="1500" frameborder="0" marginheight="0" marginwidth="0">Loading...</iframe> +<iframe src="https://docs.google.com/forms/d/e/1FAIpQLScHtRCy2l8SFv1r-SZjTVxDNiiXSC64Gnx…" width="90%" height="1500" frameborder="0" marginheight="0" marginwidth="0">Loading...</iframe>

1 0

Akihiro Sagawa : advapi32: Support the base directory parameter in RegLoadMUIString.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: 1b7f3698f076458a2bb5aff808ef49f4d2ec8229 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b7f3698f076458a2bb5aff8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu May 9 22:07:27 2019 +0900 advapi32: Support the base directory parameter in RegLoadMUIString. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 45 +++++++++++++++++++++++++++++++----------- dlls/advapi32/tests/registry.c | 4 ++-- dlls/kernel32/time.c | 2 +- 3 files changed, 36 insertions(+), 15 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 43ea3b3..469818c 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -3161,7 +3161,7 @@ static int load_string(HINSTANCE hModule, UINT resId, LPWSTR pwszBuffer, INT cMa * cbBuffer [I] Size of the destination buffer in bytes. * pcbData [O] Number of bytes written to pszBuffer (optional, may be NULL). * dwFlags [I] None supported yet. - * pszBaseDir [I] Not supported yet. + * pszBaseDir [I] Base directory of loading path. If NULL, use the current directory. * * RETURNS * Success: ERROR_SUCCESS, @@ -3177,7 +3177,7 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer DWORD dwValueType, cbData; LPWSTR pwszTempBuffer = NULL, pwszExpandedBuffer = NULL; LONG result; - + TRACE("(hKey = %p, pwszValue = %s, pwszBuffer = %p, cbBuffer = %d, pcbData = %p, " "dwFlags = %d, pwszBaseDir = %s)\n", hKey, debugstr_w(pwszValue), pwszBuffer, cbBuffer, pcbData, dwFlags, debugstr_w(pwszBaseDir)); @@ -3186,11 +3186,6 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer if (!hKey || !pwszBuffer) return ERROR_INVALID_PARAMETER; - if (pwszBaseDir && *pwszBaseDir) { - FIXME("BaseDir parameter not yet supported!\n"); - return ERROR_INVALID_PARAMETER; - } - /* Check for value existence and correctness of its type, allocate a buffer and load it. */ result = RegQueryValueExW(hKey, pwszValue, NULL, &dwValueType, NULL, &cbData); if (result != ERROR_SUCCESS) goto cleanup; @@ -3215,7 +3210,7 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer result = ERROR_NOT_ENOUGH_MEMORY; goto cleanup; } - ExpandEnvironmentStringsW(pwszTempBuffer, pwszExpandedBuffer, cbData); + ExpandEnvironmentStringsW(pwszTempBuffer, pwszExpandedBuffer, cbData / sizeof(WCHAR)); } else { pwszExpandedBuffer = heap_alloc(cbData); memcpy(pwszExpandedBuffer, pwszTempBuffer, cbData); @@ -3227,8 +3222,10 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer if (*pwszExpandedBuffer != '@') { /* '@' is the prefix for resource based string entries. */ lstrcpynW(pwszBuffer, pwszExpandedBuffer, cbBuffer / sizeof(WCHAR)); } else { - WCHAR *pComma = strrchrW(pwszExpandedBuffer, ','); + WCHAR *pComma = strrchrW(pwszExpandedBuffer, ','), *pNewBuffer; + const WCHAR backslashW[] = {'\\',0}; UINT uiStringId; + DWORD baseDirLen; HMODULE hModule; /* Format of the expanded value is 'path_to_dll,-resId' */ @@ -3236,17 +3233,41 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer result = ERROR_BADKEY; goto cleanup; } - + uiStringId = atoiW(pComma+2); *pComma = '\0'; - hModule = LoadLibraryExW(pwszExpandedBuffer + 1, NULL, + /* Build a resource dll path. */ + baseDirLen = pwszBaseDir ? strlenW(pwszBaseDir) : 0; + cbData = (baseDirLen + 1 + strlenW(pwszExpandedBuffer + 1) + 1) * sizeof(WCHAR); + pNewBuffer = heap_realloc(pwszTempBuffer, cbData); + if (!pNewBuffer) { + result = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + pwszTempBuffer = pNewBuffer; + pwszTempBuffer[0] = '\0'; + if (baseDirLen) { + strcpyW(pwszTempBuffer, pwszBaseDir); + if (pwszBaseDir[baseDirLen - 1] != '\\') + strcatW(pwszTempBuffer, backslashW); + } + strcatW(pwszTempBuffer, pwszExpandedBuffer + 1); + + /* Verify the file existence. i.e. We don't rely on PATH variable */ + if (GetFileAttributesW(pwszTempBuffer) == INVALID_FILE_ATTRIBUTES) { + result = ERROR_FILE_NOT_FOUND; + goto cleanup; + } + + /* Load the file */ + hModule = LoadLibraryExW(pwszTempBuffer, NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE); if (!hModule || !load_string(hModule, uiStringId, pwszBuffer, cbBuffer/sizeof(WCHAR))) result = ERROR_BADKEY; FreeLibrary(hModule); } - + cleanup: heap_free(pwszTempBuffer); heap_free(pwszExpandedBuffer); diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index f5bcbf3..d6edb02 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3925,7 +3925,7 @@ static void test_RegLoadMUIString(void) size = 0xdeadbeef; memset(bufW, 0xff, sizeof(bufW)); ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, ARRAY_SIZE(bufW), &size, 0, sysdirW); - todo_wine ok(ret == ERROR_SUCCESS, "got %d, expected ERROR_SUCCESS\n", ret); + ok(ret == ERROR_SUCCESS, "got %d, expected ERROR_SUCCESS\n", ret); todo_wine ok(size == text_size, "got %u, expected %u\n", size, text_size); size = min(size, sizeof(bufW)); todo_wine ok(!memcmp(textW, bufW, size), "got %s, expected %s\n", @@ -3935,7 +3935,7 @@ static void test_RegLoadMUIString(void) todo_wine ok(ret == ERROR_CALL_NOT_IMPLEMENTED, "got %d, expected ERROR_CALL_NOT_IMPLEMENTED\n", ret); ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, ARRAY_SIZE(bufW), &size, 0, NULL); - todo_wine ok(ret == ERROR_FILE_NOT_FOUND, "got %d, expected ERROR_FILE_NOT_FOUND\n", ret); + ok(ret == ERROR_FILE_NOT_FOUND, "got %d, expected ERROR_FILE_NOT_FOUND\n", ret); ret = pRegLoadMUIStringA(hkey, tz_value, buf, ARRAY_SIZE(buf), &size, 0, NULL); todo_wine ok(ret == ERROR_CALL_NOT_IMPLEMENTED, "got %d, expected ERROR_CALL_NOT_IMPLEMENTED\n", ret); diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 4a4c494..256cd62 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -380,7 +380,7 @@ static BOOL reg_load_mui_string(HKEY hkey, LPCWSTR value, LPWSTR buffer, DWORD s if (hDll) { pRegLoadMUIStringW = (void *)GetProcAddress(hDll, "RegLoadMUIStringW"); if (pRegLoadMUIStringW && - !pRegLoadMUIStringW(hkey, value, buffer, size, NULL, 0, NULL)) + !pRegLoadMUIStringW(hkey, value, buffer, size, NULL, 0, DIR_System)) ret = TRUE; FreeLibrary(hDll); }

1 0

Akihiro Sagawa : advapi32: Improve parameter sanity checks in RegLoadMUIString.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: ec716f74d7a6f1a878138f943f09b8c888a69cd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec716f74d7a6f1a878138f94… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu May 9 22:07:28 2019 +0900 advapi32: Improve parameter sanity checks in RegLoadMUIString. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 2 +- dlls/advapi32/tests/registry.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 469818c..a9a5841 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -3183,7 +3183,7 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer cbBuffer, pcbData, dwFlags, debugstr_w(pwszBaseDir)); /* Parameter sanity checks. */ - if (!hKey || !pwszBuffer) + if (!hKey || (!pwszBuffer && cbBuffer) || (cbBuffer % sizeof(WCHAR))) return ERROR_INVALID_PARAMETER; /* Check for value existence and correctness of its type, allocate a buffer and load it. */ diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index d6edb02..ccda877 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3896,8 +3896,8 @@ static void test_RegLoadMUIString(void) memset(bufW, 0xff, sizeof(bufW)); ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, sizeof(WCHAR)+1, &size, 0, NULL); - todo_wine ok(ret == ERROR_INVALID_PARAMETER, "got %d, expected ERROR_INVALID_PARAMETER\n", ret); - todo_wine ok(bufW[0] == 0xffff, "got 0x%04x, expected 0xffff\n", bufW[0]); + ok(ret == ERROR_INVALID_PARAMETER, "got %d, expected ERROR_INVALID_PARAMETER\n", ret); + ok(bufW[0] == 0xffff, "got 0x%04x, expected 0xffff\n", bufW[0]); size = 0xdeadbeef; memset(bufW, 0xff, sizeof(bufW));

1 0

Akihiro Sagawa : advapi32: Improve load_string to return error code.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: bfdfe85229b94bc8e9e033ab85f641e23077c6eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfdfe85229b94bc8e9e033ab… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu May 9 22:07:30 2019 +0900 advapi32: Improve load_string to return error code. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 19 +++++++++++-------- dlls/advapi32/tests/registry.c | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index a9a5841..328ae39 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -3112,7 +3112,7 @@ LSTATUS WINAPI RegOpenUserClassesRoot( * avoid importing user32, which is higher level than advapi32. Helper for * RegLoadMUIString. */ -static int load_string(HINSTANCE hModule, UINT resId, LPWSTR pwszBuffer, INT cMaxChars) +static LONG load_string(HINSTANCE hModule, UINT resId, LPWSTR pwszBuffer, INT cMaxChars) { HGLOBAL hMemory; HRSRC hResource; @@ -3125,17 +3125,17 @@ static int load_string(HINSTANCE hModule, UINT resId, LPWSTR pwszBuffer, INT cMa /* Load the resource into memory and get a pointer to it. */ hResource = FindResourceW(hModule, MAKEINTRESOURCEW(LOWORD(resId >> 4) + 1), (LPWSTR)RT_STRING); - if (!hResource) return 0; + if (!hResource) return ERROR_FILE_NOT_FOUND; hMemory = LoadResource(hModule, hResource); - if (!hMemory) return 0; + if (!hMemory) return ERROR_FILE_NOT_FOUND; pString = LockResource(hMemory); /* Strings are length-prefixed. Lowest nibble of resId is an index. */ idxString = resId & 0xf; while (idxString--) pString += *pString + 1; - /* If no buffer is given, return length of the string. */ - if (!pwszBuffer) return *pString; + /* If no buffer is given, return here. */ + if (!pwszBuffer) return ERROR_MORE_DATA; /* Else copy over the string, respecting the buffer size. */ cMaxChars = (*pString < cMaxChars) ? *pString : (cMaxChars - 1); @@ -3144,7 +3144,7 @@ static int load_string(HINSTANCE hModule, UINT resId, LPWSTR pwszBuffer, INT cMa pwszBuffer[cMaxChars] = '\0'; } - return cMaxChars; + return ERROR_SUCCESS; } /****************************************************************************** @@ -3263,9 +3263,12 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer /* Load the file */ hModule = LoadLibraryExW(pwszTempBuffer, NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE); - if (!hModule || !load_string(hModule, uiStringId, pwszBuffer, cbBuffer/sizeof(WCHAR))) + if (hModule) { + result = load_string(hModule, uiStringId, pwszBuffer, cbBuffer/sizeof(WCHAR)); + FreeLibrary(hModule); + } + else result = ERROR_BADKEY; - FreeLibrary(hModule); } cleanup: diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index ccda877..cadb936 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3891,7 +3891,7 @@ static void test_RegLoadMUIString(void) size = 0xdeadbeef; ret = pRegLoadMUIStringW(hkey, tz_valueW, NULL, 0, &size, 0, NULL); - todo_wine ok(ret == ERROR_MORE_DATA, "got %d, expected ERROR_MORE_DATA\n", ret); + ok(ret == ERROR_MORE_DATA, "got %d, expected ERROR_MORE_DATA\n", ret); todo_wine ok(size == text_size, "got %u, expected %u\n", size, text_size); memset(bufW, 0xff, sizeof(bufW));

1 0

Akihiro Sagawa : advapi32: Remove useless RegLoadMUIStringA implementation.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: 2d9a7cd39de010e7a11e9e7c919b1dcf7082ccbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d9a7cd39de010e7a11e9e7c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu May 9 22:07:32 2019 +0900 advapi32: Remove useless RegLoadMUIStringA implementation. This commit avoids brokeness in advance. Otherwise, it will be broken when we support ERROR_MORE_DATA in RegLoadMUIStringW. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 32 ++------------------------------ dlls/advapi32/tests/registry.c | 6 +++--- 2 files changed, 5 insertions(+), 33 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 328ae39..97561e2 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -3280,40 +3280,12 @@ cleanup: /****************************************************************************** * RegLoadMUIStringA [ADVAPI32.@] * - * See RegLoadMUIStringW + * Not implemented on native. */ LSTATUS WINAPI RegLoadMUIStringA(HKEY hKey, LPCSTR pszValue, LPSTR pszBuffer, DWORD cbBuffer, LPDWORD pcbData, DWORD dwFlags, LPCSTR pszBaseDir) { - UNICODE_STRING valueW, baseDirW; - WCHAR *pwszBuffer; - DWORD cbData = cbBuffer * sizeof(WCHAR); - LONG result; - - valueW.Buffer = baseDirW.Buffer = pwszBuffer = NULL; - if (!RtlCreateUnicodeStringFromAsciiz(&valueW, pszValue) || - !RtlCreateUnicodeStringFromAsciiz(&baseDirW, pszBaseDir) || - !(pwszBuffer = heap_alloc(cbData))) - { - result = ERROR_NOT_ENOUGH_MEMORY; - goto cleanup; - } - - result = RegLoadMUIStringW(hKey, valueW.Buffer, pwszBuffer, cbData, NULL, dwFlags, - baseDirW.Buffer); - - if (result == ERROR_SUCCESS) { - cbData = WideCharToMultiByte(CP_ACP, 0, pwszBuffer, -1, pszBuffer, cbBuffer, NULL, NULL); - if (pcbData) - *pcbData = cbData; - } - -cleanup: - heap_free(pwszBuffer); - RtlFreeUnicodeString(&baseDirW); - RtlFreeUnicodeString(&valueW); - - return result; + return ERROR_CALL_NOT_IMPLEMENTED; } /****************************************************************************** diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index cadb936..a1fcb5e 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3917,7 +3917,7 @@ static void test_RegLoadMUIString(void) wine_dbgstr_wn(bufW, size / sizeof(WCHAR)), wine_dbgstr_wn(textW, text_size / sizeof(WCHAR))); ret = pRegLoadMUIStringA(hkey, tz_value, buf, ARRAY_SIZE(buf), &size, 0, NULL); - todo_wine ok(ret == ERROR_CALL_NOT_IMPLEMENTED, "got %d, expected ERROR_CALL_NOT_IMPLEMENTED\n", ret); + ok(ret == ERROR_CALL_NOT_IMPLEMENTED, "got %d, expected ERROR_CALL_NOT_IMPLEMENTED\n", ret); /* change the current direcoty to other than system32 directory */ SetCurrentDirectoryA("\\"); @@ -3932,13 +3932,13 @@ static void test_RegLoadMUIString(void) wine_dbgstr_wn(bufW, size / sizeof(WCHAR)), wine_dbgstr_wn(textW, text_size / sizeof(WCHAR))); ret = pRegLoadMUIStringA(hkey, tz_value, buf, ARRAY_SIZE(buf), &size, 0, sysdir); - todo_wine ok(ret == ERROR_CALL_NOT_IMPLEMENTED, "got %d, expected ERROR_CALL_NOT_IMPLEMENTED\n", ret); + ok(ret == ERROR_CALL_NOT_IMPLEMENTED, "got %d, expected ERROR_CALL_NOT_IMPLEMENTED\n", ret); ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, ARRAY_SIZE(bufW), &size, 0, NULL); ok(ret == ERROR_FILE_NOT_FOUND, "got %d, expected ERROR_FILE_NOT_FOUND\n", ret); ret = pRegLoadMUIStringA(hkey, tz_value, buf, ARRAY_SIZE(buf), &size, 0, NULL); - todo_wine ok(ret == ERROR_CALL_NOT_IMPLEMENTED, "got %d, expected ERROR_CALL_NOT_IMPLEMENTED\n", ret); + ok(ret == ERROR_CALL_NOT_IMPLEMENTED, "got %d, expected ERROR_CALL_NOT_IMPLEMENTED\n", ret); RegCloseKey(hkey); SetCurrentDirectoryW(curdirW);

1 0

Akihiro Sagawa : advapi32: Return required buffer size in RegLoadMUIString.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: 4fe6460a3047806309c9b7bbedeb98b3f9fb5eb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fe6460a3047806309c9b7bb… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu May 9 22:07:34 2019 +0900 advapi32: Return required buffer size in RegLoadMUIString. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 10 ++++++++-- dlls/advapi32/tests/registry.c | 14 ++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 97561e2..7cf9ed1 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -3112,7 +3112,7 @@ LSTATUS WINAPI RegOpenUserClassesRoot( * avoid importing user32, which is higher level than advapi32. Helper for * RegLoadMUIString. */ -static LONG load_string(HINSTANCE hModule, UINT resId, LPWSTR pwszBuffer, INT cMaxChars) +static LONG load_string(HINSTANCE hModule, UINT resId, LPWSTR pwszBuffer, INT cMaxChars, UINT *reqChars) { HGLOBAL hMemory; HRSRC hResource; @@ -3133,6 +3133,7 @@ static LONG load_string(HINSTANCE hModule, UINT resId, LPWSTR pwszBuffer, INT cM /* Strings are length-prefixed. Lowest nibble of resId is an index. */ idxString = resId & 0xf; while (idxString--) pString += *pString + 1; + *reqChars = *pString + 1; /* If no buffer is given, return here. */ if (!pwszBuffer) return ERROR_MORE_DATA; @@ -3221,6 +3222,8 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer result = ERROR_SUCCESS; if (*pwszExpandedBuffer != '@') { /* '@' is the prefix for resource based string entries. */ lstrcpynW(pwszBuffer, pwszExpandedBuffer, cbBuffer / sizeof(WCHAR)); + if (pcbData) + *pcbData = (strlenW(pwszExpandedBuffer) + 1) * sizeof(WCHAR); } else { WCHAR *pComma = strrchrW(pwszExpandedBuffer, ','), *pNewBuffer; const WCHAR backslashW[] = {'\\',0}; @@ -3264,7 +3267,10 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer hModule = LoadLibraryExW(pwszTempBuffer, NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE); if (hModule) { - result = load_string(hModule, uiStringId, pwszBuffer, cbBuffer/sizeof(WCHAR)); + DWORD reqChars; + result = load_string(hModule, uiStringId, pwszBuffer, cbBuffer/sizeof(WCHAR), &reqChars); + if (pcbData && (result == ERROR_SUCCESS || result == ERROR_MORE_DATA)) + *pcbData = reqChars * sizeof(WCHAR); FreeLibrary(hModule); } else diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index a1fcb5e..b8974f2 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3892,7 +3892,7 @@ static void test_RegLoadMUIString(void) size = 0xdeadbeef; ret = pRegLoadMUIStringW(hkey, tz_valueW, NULL, 0, &size, 0, NULL); ok(ret == ERROR_MORE_DATA, "got %d, expected ERROR_MORE_DATA\n", ret); - todo_wine ok(size == text_size, "got %u, expected %u\n", size, text_size); + ok(size == text_size, "got %u, expected %u\n", size, text_size); memset(bufW, 0xff, sizeof(bufW)); ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, sizeof(WCHAR)+1, &size, 0, NULL); @@ -3903,7 +3903,7 @@ static void test_RegLoadMUIString(void) memset(bufW, 0xff, sizeof(bufW)); ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, sizeof(WCHAR)*2, &size, 0, NULL); todo_wine ok(ret == ERROR_MORE_DATA, "got %d, expected ERROR_MORE_DATA\n", ret); - todo_wine ok(size == text_size || broken(size == text_size + sizeof(WCHAR) /* vista */), + ok(size == text_size || broken(size == text_size + sizeof(WCHAR) /* vista */), "got %u, expected %u\n", size, text_size); todo_wine ok(bufW[0] == 0xffff, "got 0x%04x, expected 0xffff\n", bufW[0]); @@ -3911,9 +3911,8 @@ static void test_RegLoadMUIString(void) memset(bufW, 0xff, sizeof(bufW)); ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, ARRAY_SIZE(bufW), &size, 0, NULL); ok(ret == ERROR_SUCCESS, "got %d, expected ERROR_SUCCESS\n", ret); - todo_wine ok(size == text_size, "got %u, expected %u\n", size, text_size); - size = min(size, sizeof(bufW)); - todo_wine ok(!memcmp(textW, bufW, size), "got %s, expected %s\n", + ok(size == text_size, "got %u, expected %u\n", size, text_size); + ok(!memcmp(textW, bufW, size), "got %s, expected %s\n", wine_dbgstr_wn(bufW, size / sizeof(WCHAR)), wine_dbgstr_wn(textW, text_size / sizeof(WCHAR))); ret = pRegLoadMUIStringA(hkey, tz_value, buf, ARRAY_SIZE(buf), &size, 0, NULL); @@ -3926,9 +3925,8 @@ static void test_RegLoadMUIString(void) memset(bufW, 0xff, sizeof(bufW)); ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, ARRAY_SIZE(bufW), &size, 0, sysdirW); ok(ret == ERROR_SUCCESS, "got %d, expected ERROR_SUCCESS\n", ret); - todo_wine ok(size == text_size, "got %u, expected %u\n", size, text_size); - size = min(size, sizeof(bufW)); - todo_wine ok(!memcmp(textW, bufW, size), "got %s, expected %s\n", + ok(size == text_size, "got %u, expected %u\n", size, text_size); + ok(!memcmp(textW, bufW, size), "got %s, expected %s\n", wine_dbgstr_wn(bufW, size / sizeof(WCHAR)), wine_dbgstr_wn(textW, text_size / sizeof(WCHAR))); ret = pRegLoadMUIStringA(hkey, tz_value, buf, ARRAY_SIZE(buf), &size, 0, sysdir);

1 0

Alistair Leslie-Hughes : dinput: Allow enumeration of joysticks with DirectX 3.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: fe4db5309e3754a96873d959736b5c9099a5ef38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe4db5309e3754a96873d959… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 10 03:46:11 2019 +0000 dinput: Allow enumeration of joysticks with DirectX 3. Star Wars: Rogue 3D requests a DirectX 3.0 version 0108:trace:dinput:DirectInputCreateEx (0x400000,0300,{9a4cb684-236d-11d3-8e9d-00c04f6844ae},0x7acfa0,(nil)) and then tries to interate over all Joysticks. When using modern windows, the current tests show that this is the correct behaviour. However, it's possible to use a shim to allow older games, like the one above, to interate over joysticks. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linux.c | 4 ++-- dlls/dinput/joystick_linuxinput.c | 4 ++-- dlls/dinput/joystick_osx.c | 4 ++-- dlls/dinput/tests/joystick.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 5c4a353..2480bc2 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -415,7 +415,7 @@ static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS } if ((dwDevType == 0) || - ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || + ((dwDevType == DIDEVTYPE_JOYSTICK) && (version >= 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { /* check whether we have a joystick */ if ((fd = open(joystick_devices[id].device, O_RDONLY)) == -1) @@ -444,7 +444,7 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS } if ((dwDevType == 0) || - ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || + ((dwDevType == DIDEVTYPE_JOYSTICK) && (version >= 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { /* check whether we have a joystick */ if ((fd = open(joystick_devices[id].device, O_RDONLY)) == -1) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 3ab0483..3c27f0d 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -418,7 +418,7 @@ static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS } if (!((dwDevType == 0) || - ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || + ((dwDevType == DIDEVTYPE_JOYSTICK) && (version >= 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800)))) return S_FALSE; @@ -443,7 +443,7 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS } if (!((dwDevType == 0) || - ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || + ((dwDevType == DIDEVTYPE_JOYSTICK) && (version >= 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800)))) return S_FALSE; diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 5ddfcbb..540d16b 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -954,7 +954,7 @@ static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS device = get_device_ref(id); if ((dwDevType == 0) || - ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || + ((dwDevType == DIDEVTYPE_JOYSTICK) && (version >= 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { if (dwFlags & DIEDFL_FORCEFEEDBACK) { @@ -1002,7 +1002,7 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS device = get_device_ref(id); if ((dwDevType == 0) || - ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || + ((dwDevType == DIDEVTYPE_JOYSTICK) && (version >= 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { if (dwFlags & DIEDFL_FORCEFEEDBACK) { diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index 631ea57..c07e821 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -321,7 +321,7 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) DIPROPDWORD dip_gain_set, dip_gain_get; struct effect_enum effect_data; - ok(data->version > 0x0300, "Joysticks not supported in version 0x%04x\n", data->version); + ok(data->version >= 0x0300, "Joysticks not supported in version 0x%04x\n", data->version); hr = IDirectInput_CreateDevice(data->pDI, &lpddi->guidInstance, NULL, NULL); ok(hr==E_POINTER,"IDirectInput_CreateDevice() should have returned "

1 0

Roman Stingler : include: Added some process creation Flags.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: 9a64bfc533cc4fede49a5cba6b1e456560f50966 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a64bfc533cc4fede49a5cba… Author: Roman Stingler <roman.stingler(a)gmail.com> Date: Wed May 8 22:34:07 2019 +0200 include: Added some process creation Flags. Signed-off-by: Roman Stingler <roman.stingler(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 53 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 314a8b7..887e1c1 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -672,29 +672,38 @@ typedef struct _TIME_ZONE_INFORMATION{ /* CreateProcess: dwCreationFlag values */ -#define DEBUG_PROCESS 0x00000001 -#define DEBUG_ONLY_THIS_PROCESS 0x00000002 -#define CREATE_SUSPENDED 0x00000004 -#define DETACHED_PROCESS 0x00000008 -#define CREATE_NEW_CONSOLE 0x00000010 -#define NORMAL_PRIORITY_CLASS 0x00000020 -#define IDLE_PRIORITY_CLASS 0x00000040 -#define HIGH_PRIORITY_CLASS 0x00000080 -#define REALTIME_PRIORITY_CLASS 0x00000100 -#define BELOW_NORMAL_PRIORITY_CLASS 0x00004000 -#define ABOVE_NORMAL_PRIORITY_CLASS 0x00008000 -#define CREATE_NEW_PROCESS_GROUP 0x00000200 -#define CREATE_UNICODE_ENVIRONMENT 0x00000400 -#define CREATE_SEPARATE_WOW_VDM 0x00000800 -#define CREATE_SHARED_WOW_VDM 0x00001000 -#define STACK_SIZE_PARAM_IS_A_RESERVATION 0x00010000 -#define CREATE_BREAKAWAY_FROM_JOB 0x01000000 -#define CREATE_DEFAULT_ERROR_MODE 0x04000000 -#define CREATE_NO_WINDOW 0x08000000 -#define PROFILE_USER 0x10000000 -#define PROFILE_KERNEL 0x20000000 -#define PROFILE_SERVER 0x40000000 +#define DEBUG_PROCESS 0x00000001 +#define DEBUG_ONLY_THIS_PROCESS 0x00000002 +#define CREATE_SUSPENDED 0x00000004 +#define DETACHED_PROCESS 0x00000008 +#define CREATE_NEW_CONSOLE 0x00000010 +#define NORMAL_PRIORITY_CLASS 0x00000020 +#define IDLE_PRIORITY_CLASS 0x00000040 +#define HIGH_PRIORITY_CLASS 0x00000080 +#define REALTIME_PRIORITY_CLASS 0x00000100 +#define CREATE_NEW_PROCESS_GROUP 0x00000200 +#define CREATE_UNICODE_ENVIRONMENT 0x00000400 +#define CREATE_SEPARATE_WOW_VDM 0x00000800 +#define CREATE_SHARED_WOW_VDM 0x00001000 +#define CREATE_FORCEDOS 0x00002000 +#define BELOW_NORMAL_PRIORITY_CLASS 0x00004000 +#define ABOVE_NORMAL_PRIORITY_CLASS 0x00008000 +#define INHERIT_PARENT_AFFINITY 0x00010000 +#define INHERIT_CALLER_PRIORITY 0x00020000 +#define CREATE_PROTECTED_PROCESS 0x00040000 +#define EXTENDED_STARTUPINFO_PRESENT 0x00080000 +#define PROCESS_MODE_BACKGROUND_BEGIN 0x00100000 +#define PROCESS_MODE_BACKGROUND_END 0x00200000 +#define CREATE_SECURE_PROCESS 0x00400000 +#define CREATE_BREAKAWAY_FROM_JOB 0x01000000 +#define CREATE_PRESERVE_CODE_AUTHZ_LEVEL 0x02000000 +#define CREATE_DEFAULT_ERROR_MODE 0x04000000 +#define CREATE_NO_WINDOW 0x08000000 +#define PROFILE_USER 0x10000000 +#define PROFILE_KERNEL 0x20000000 +#define PROFILE_SERVER 0x40000000 +#define STACK_SIZE_PARAM_IS_A_RESERVATION 0x00010000 /* File object type definitions */

1 0