October 2010 - Wine-commits

Andrew Nguyen : msvcrt: Implement _itoa_s.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: bcfaf467b590e6b1b1edf6e8311f0ee975bb356c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcfaf467b590e6b1b1edf6e83… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Oct 11 05:25:15 2010 -0500 msvcrt: Implement _itoa_s. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 75 ++++++++++++++++++++++++++++++++++ dlls/msvcrt/tests/string.c | 95 +++++++++++++++++++++++++++++++++++++++++++ include/msvcrt/stdlib.h | 1 + 7 files changed, 175 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 042437e..eb8028d 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -834,7 +834,7 @@ @ stub _iswxdigit_l @ stub _isxdigit_l @ cdecl _itoa(long ptr long) msvcrt._itoa -@ stub _itoa_s +@ cdecl _itoa_s(long ptr long long) msvcrt._itoa_s @ cdecl _itow(long ptr long) msvcrt._itow @ stub _itow_s @ cdecl _j0(double) msvcrt._j0 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index c1d18d6..b5be55f 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -680,7 +680,7 @@ @ stub _iswxdigit_l @ stub _isxdigit_l @ cdecl _itoa(long ptr long) msvcrt._itoa -@ stub _itoa_s +@ cdecl _itoa_s(long ptr long long) msvcrt._itoa_s @ cdecl _itow(long ptr long) msvcrt._itow @ stub _itow_s @ cdecl _j0(double) msvcrt._j0 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 6d5d518..5647b13 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -668,7 +668,7 @@ @ stub _iswxdigit_l @ stub _isxdigit_l @ cdecl _itoa(long ptr long) msvcrt._itoa -@ stub _itoa_s +@ cdecl _itoa_s(long ptr long long) msvcrt._itoa_s @ cdecl _itow(long ptr long) msvcrt._itow @ stub _itow_s @ cdecl _j0(double) msvcrt._j0 diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e628e48..b964724 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -607,7 +607,7 @@ # stub _iswxdigit_l # stub _isxdigit_l @ cdecl _itoa(long ptr long) ntdll._itoa -# stub _itoa_s +@ cdecl _itoa_s(long ptr long long) @ cdecl _itow(long ptr long) ntdll._itow # stub _itow_s @ cdecl _j0(double) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index f44e6eb..0b1beae 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -637,6 +637,81 @@ unsigned __int64 CDECL MSVCRT_strtoui64(const char *nptr, char **endptr, int bas } /********************************************************************* + * _itoa_s (MSVCRT.@) + */ +int CDECL _itoa_s(int value, char *str, MSVCRT_size_t size, int radix) +{ + unsigned int val, digit; + int is_negative; + char buffer[33], *pos; + size_t len; + + if (!str || !size || radix < 2 || radix > 36) + { + if (str && size) + str[0] = '\0'; + + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + if (value < 0 && radix == 10) + { + is_negative = 1; + val = -value; + } + else + { + is_negative = 0; + val = value; + } + + pos = buffer + 32; + *pos = '\0'; + + do + { + digit = val % radix; + val /= radix; + + if (digit < 10) + *--pos = '0' + digit; + else + *--pos = 'a' + digit - 10; + } + while (val != 0); + + if (is_negative) + *--pos = '-'; + + len = buffer + 33 - pos; + if (len > size) + { + size_t i; + char *p = str; + + /* Copy the temporary buffer backwards up to the available number of + * characters. Don't copy the negative sign if present. */ + + if (is_negative) + { + p++; + size--; + } + + for (pos = buffer + 31, i = 0; i < size; i++) + *p++ = *pos--; + + str[0] = '\0'; + *MSVCRT__errno() = MSVCRT_ERANGE; + return MSVCRT_ERANGE; + } + + memcpy(str, pos, len); + return 0; +} + +/********************************************************************* * _ui64toa_s (MSVCRT.@) */ int CDECL MSVCRT__ui64toa_s(unsigned __int64 value, char *str, diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 0ea1198..4955f75 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -59,6 +59,7 @@ static unsigned __int64 (__cdecl *p_strtoui64)(const char *, char **, int); static int (__cdecl *pwcstombs_s)(size_t*,char*,size_t,const wchar_t*,size_t); static int (__cdecl *pmbstowcs_s)(size_t*,wchar_t*,size_t,const char*,size_t); static errno_t (__cdecl *p_gcvt_s)(char*,size_t,double,int); +static errno_t (__cdecl *p_itoa_s)(int,char*,size_t,int); static int *p__mb_cur_max; static unsigned char *p_mbctype; @@ -1277,6 +1278,98 @@ static void test_gcvt(void) ok(buf[0] == '\0', "buf[0] = %c\n", buf[0]); } +static void test__itoa_s(void) +{ + errno_t ret; + char buffer[33]; + + if (!p_itoa_s) + { + win_skip("Skipping _itoa_s tests\n"); + return; + } + + errno = EBADF; + ret = p_itoa_s(0, NULL, 0, 0); + ok(ret == EINVAL, "Expected _itoa_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + memset(buffer, 'X', sizeof(buffer)); + errno = EBADF; + ret = p_itoa_s(0, buffer, 0, 0); + ok(ret == EINVAL, "Expected _itoa_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + ok(buffer[0] == 'X', "Expected the output buffer to be untouched\n"); + + memset(buffer, 'X', sizeof(buffer)); + errno = EBADF; + ret = p_itoa_s(0, buffer, sizeof(buffer), 0); + ok(ret == EINVAL, "Expected _itoa_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + ok(buffer[0] == '\0', "Expected the output buffer to be null terminated\n"); + + memset(buffer, 'X', sizeof(buffer)); + errno = EBADF; + ret = p_itoa_s(0, buffer, sizeof(buffer), 64); + ok(ret == EINVAL, "Expected _itoa_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + ok(buffer[0] == '\0', "Expected the output buffer to be null terminated\n"); + + memset(buffer, 'X', sizeof(buffer)); + errno = EBADF; + ret = p_itoa_s(12345678, buffer, 4, 10); + ok(ret == ERANGE, "Expected _itoa_s to return ERANGE, got %d\n", ret); + ok(errno == ERANGE, "Expected errno to be ERANGE, got %d\n", errno); + ok(!memcmp(buffer, "\000765", 4), + "Expected the output buffer to be null terminated with truncated output\n"); + + memset(buffer, 'X', sizeof(buffer)); + errno = EBADF; + ret = p_itoa_s(12345678, buffer, 8, 10); + ok(ret == ERANGE, "Expected _itoa_s to return ERANGE, got %d\n", ret); + ok(errno == ERANGE, "Expected errno to be ERANGE, got %d\n", errno); + ok(!memcmp(buffer, "\0007654321", 8), + "Expected the output buffer to be null terminated with truncated output\n"); + + memset(buffer, 'X', sizeof(buffer)); + errno = EBADF; + ret = p_itoa_s(-12345678, buffer, 9, 10); + ok(ret == ERANGE, "Expected _itoa_s to return ERANGE, got %d\n", ret); + ok(errno == ERANGE, "Expected errno to be ERANGE, got %d\n", errno); + ok(!memcmp(buffer, "\00087654321", 9), + "Expected the output buffer to be null terminated with truncated output\n"); + + ret = p_itoa_s(12345678, buffer, 9, 10); + ok(ret == 0, "Expected _itoa_s to return 0, got %d\n", ret); + ok(!strcmp(buffer, "12345678"), + "Expected output buffer string to be \"12345678\", got \"%s\"\n", + buffer); + + ret = p_itoa_s(43690, buffer, sizeof(buffer), 2); + ok(ret == 0, "Expected _itoa_s to return 0, got %d\n", ret); + ok(!strcmp(buffer, "1010101010101010"), + "Expected output buffer string to be \"1010101010101010\", got \"%s\"\n", + buffer); + + ret = p_itoa_s(1092009, buffer, sizeof(buffer), 36); + ok(ret == 0, "Expected _itoa_s to return 0, got %d\n", ret); + ok(!strcmp(buffer, "nell"), + "Expected output buffer string to be \"nell\", got \"%s\"\n", + buffer); + + ret = p_itoa_s(5704, buffer, sizeof(buffer), 18); + ok(ret == 0, "Expected _itoa_s to return 0, got %d\n", ret); + ok(!strcmp(buffer, "hag"), + "Expected output buffer string to be \"hag\", got \"%s\"\n", + buffer); + + ret = p_itoa_s(-12345678, buffer, sizeof(buffer), 10); + ok(ret == 0, "Expected _itoa_s to return 0, got %d\n", ret); + ok(!strcmp(buffer, "-12345678"), + "Expected output buffer string to be \"-12345678\", got \"%s\"\n", + buffer); +} + START_TEST(string) { char mem[100]; @@ -1302,6 +1395,7 @@ START_TEST(string) pmbstowcs_s = (void *)GetProcAddress(hMsvcrt, "mbstowcs_s"); pwcstombs_s = (void *)GetProcAddress(hMsvcrt, "wcstombs_s"); p_gcvt_s = (void *)GetProcAddress(hMsvcrt, "_gcvt_s"); + p_itoa_s = (void *)GetProcAddress(hMsvcrt, "_itoa_s"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -1336,4 +1430,5 @@ START_TEST(string) test__strtod(); test_mbstowcs(); test_gcvt(); + test__itoa_s(); } diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index bef83f4..086c3e1 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -148,6 +148,7 @@ char* __cdecl _fullpath(char*,const char*,size_t); char* __cdecl _gcvt(double,int,char*); char* __cdecl _i64toa(__int64,char*,int); char* __cdecl _itoa(int,char*,int); +errno_t __cdecl _itoa_s(int,char*,size_t,int); char* __cdecl _ltoa(__msvcrt_long,char*,int); __msvcrt_ulong __cdecl _lrotl(__msvcrt_ulong,int); __msvcrt_ulong __cdecl _lrotr(__msvcrt_ulong,int);

1 0

Andrew Nguyen : msvcrt: Implement _strlwr_s.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: 41ab8251266299e2d22551f9d333bcaa5cb1b85e URL: http://source.winehq.org/git/wine.git/?a=commit;h=41ab8251266299e2d22551f9d… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Oct 11 05:25:23 2010 -0500 msvcrt: Implement _strlwr_s. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 35 +++++++++++++++++++++++++ dlls/msvcrt/tests/string.c | 60 +++++++++++++++++++++++++++++++++++++++++++ include/msvcrt/string.h | 1 + 7 files changed, 100 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index eb8028d..60211ab 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1142,7 +1142,7 @@ @ stub _stricoll_l @ cdecl _strlwr(str) msvcrt._strlwr @ stub _strlwr_l -@ stub _strlwr_s +@ cdecl _strlwr_s(ptr long) msvcrt._strlwr_s @ stub _strlwr_s_l @ stub _strncoll @ stub _strncoll_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b5be55f..4b0363f 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -996,7 +996,7 @@ @ stub _stricoll_l @ cdecl _strlwr(str) msvcrt._strlwr @ stub _strlwr_l -@ stub _strlwr_s +@ cdecl _strlwr_s(ptr long) msvcrt._strlwr_s @ stub _strlwr_s_l @ stub _strncoll @ stub _strncoll_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 5647b13..967db82 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -982,7 +982,7 @@ @ stub _stricoll_l @ cdecl _strlwr(str) msvcrt._strlwr @ stub _strlwr_l -@ stub _strlwr_s +@ cdecl _strlwr_s(ptr long) msvcrt._strlwr_s @ stub _strlwr_s_l @ stub _strncoll @ stub _strncoll_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index b964724..e6a8670 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -917,7 +917,7 @@ # stub _stricoll_l @ cdecl _strlwr(str) ntdll._strlwr # stub _strlwr_l -# stub _strlwr_s +@ cdecl _strlwr_s(ptr long) # stub _strlwr_s_l @ stub _strncoll #(str str long) # stub _strncoll_l diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 0b1beae..02bd0a5 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -51,6 +51,41 @@ char* CDECL _strdup(const char* str) } /********************************************************************* + * _strlwr_s (MSVCRT.@) + */ +int CDECL _strlwr_s(char *str, MSVCRT_size_t len) +{ + char *ptr = str; + + if (!str || !len) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + while (len && *ptr) + { + len--; + ptr++; + } + + if (!len) + { + str[0] = '\0'; + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + while (*str) + { + *str = tolower(*str); + str++; + } + + return 0; +} + +/********************************************************************* * _strnset (MSVCRT.@) */ char* CDECL MSVCRT__strnset(char* str, int value, MSVCRT_size_t len) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 4955f75..a7d033a 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -60,6 +60,7 @@ static int (__cdecl *pwcstombs_s)(size_t*,char*,size_t,const wchar_t*,size_t); static int (__cdecl *pmbstowcs_s)(size_t*,wchar_t*,size_t,const char*,size_t); static errno_t (__cdecl *p_gcvt_s)(char*,size_t,double,int); static errno_t (__cdecl *p_itoa_s)(int,char*,size_t,int); +static errno_t (__cdecl *p_strlwr_s)(char*,size_t); static int *p__mb_cur_max; static unsigned char *p_mbctype; @@ -1370,6 +1371,63 @@ static void test__itoa_s(void) buffer); } +static void test__strlwr_s(void) +{ + errno_t ret; + char buffer[20]; + + if (!p_strlwr_s) + { + win_skip("Skipping _strlwr_s tests\n"); + return; + } + + errno = EBADF; + ret = p_strlwr_s(NULL, 0); + ok(ret == EINVAL, "Expected _strlwr_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + errno = EBADF; + ret = p_strlwr_s(NULL, sizeof(buffer)); + ok(ret == EINVAL, "Expected _strlwr_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + errno = EBADF; + ret = p_strlwr_s(buffer, 0); + ok(ret == EINVAL, "Expected _strlwr_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + strcpy(buffer, "GoRrIsTeR"); + errno = EBADF; + ret = p_strlwr_s(buffer, 5); + ok(ret == EINVAL, "Expected _strlwr_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + ok(!memcmp(buffer, "\0oRrIsTeR", sizeof("\0oRrIsTeR")), + "Expected the output buffer to be \"gorrIsTeR\"\n"); + + strcpy(buffer, "GoRrIsTeR"); + errno = EBADF; + ret = p_strlwr_s(buffer, sizeof("GoRrIsTeR") - 1); + ok(ret == EINVAL, "Expected _strlwr_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + ok(!memcmp(buffer, "\0oRrIsTeR", sizeof("\0oRrIsTeR")), + "Expected the output buffer to be \"gorrIsTeR\"\n"); + + strcpy(buffer, "GoRrIsTeR"); + ret = p_strlwr_s(buffer, sizeof("GoRrIsTeR")); + ok(ret == 0, "Expected _strlwr_s to return 0, got %d\n", ret); + ok(!strcmp(buffer, "gorrister"), + "Expected the output buffer to be \"gorrister\", got \"%s\"\n", + buffer); + + memcpy(buffer, "GoRrIsTeR\0ELLEN", sizeof("GoRrIsTeR\0ELLEN")); + ret = p_strlwr_s(buffer, sizeof(buffer)); + ok(ret == 0, "Expected _strlwr_s to return 0, got %d\n", ret); + ok(!memcmp(buffer, "gorrister\0ELLEN", sizeof("gorrister\0ELLEN")), + "Expected the output buffer to be \"gorrister\\0ELLEN\", got \"%s\"\n", + buffer); +} + START_TEST(string) { char mem[100]; @@ -1396,6 +1454,7 @@ START_TEST(string) pwcstombs_s = (void *)GetProcAddress(hMsvcrt, "wcstombs_s"); p_gcvt_s = (void *)GetProcAddress(hMsvcrt, "_gcvt_s"); p_itoa_s = (void *)GetProcAddress(hMsvcrt, "_itoa_s"); + p_strlwr_s = (void *)GetProcAddress(hMsvcrt, "_strlwr_s"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -1431,4 +1490,5 @@ START_TEST(string) test_mbstowcs(); test_gcvt(); test__itoa_s(); + test__strlwr_s(); } diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h index 614fa85..8ab459b 100644 --- a/include/msvcrt/string.h +++ b/include/msvcrt/string.h @@ -48,6 +48,7 @@ errno_t __cdecl strerror_s(char*,size_t,int); int __cdecl _stricmp(const char*,const char*); int __cdecl _stricoll(const char*,const char*); char* __cdecl _strlwr(char*); +errno_t __cdecl _strlwr_s(char*,size_t); int __cdecl _strnicmp(const char*,const char*,size_t); char* __cdecl _strnset(char*,int,size_t); char* __cdecl _strrev(char*);

1 0

Henri Verbeet : wined3d: Recognize the SM4 sample opcode.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: 407ed1b875293b357a97de8cf3ea7942a291a537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=407ed1b875293b357a97de8cf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 11 13:06:17 2010 +0200 wined3d: Recognize the SM4 sample opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ec13a65..46462a3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4995,6 +4995,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_REP */ shader_hw_rep, /* WINED3DSIH_RET */ shader_hw_ret, /* WINED3DSIH_RSQ */ shader_hw_scalar_op, + /* WINED3DSIH_SAMPLE */ NULL, /* WINED3DSIH_SETP */ NULL, /* WINED3DSIH_SGE */ shader_hw_map2gl, /* WINED3DSIH_SGN */ shader_hw_sgn, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4b65d39..3efff9a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5053,6 +5053,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_REP */ shader_glsl_rep, /* WINED3DSIH_RET */ shader_glsl_ret, /* WINED3DSIH_RSQ */ shader_glsl_rsq, + /* WINED3DSIH_SAMPLE */ NULL, /* WINED3DSIH_SETP */ NULL, /* WINED3DSIH_SGE */ shader_glsl_compare, /* WINED3DSIH_SGN */ shader_glsl_sgn, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f3ae897..ff967ce 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -99,6 +99,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_REP */ "rep", /* WINED3DSIH_RET */ "ret", /* WINED3DSIH_RSQ */ "rsq", + /* WINED3DSIH_SAMPLE */ "sample", /* WINED3DSIH_SETP */ "setp", /* WINED3DSIH_SGE */ "sge", /* WINED3DSIH_SGN */ "sgn", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index b94650c..f706b5a 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -76,6 +76,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_MUL = 0x38, WINED3D_SM4_OP_RET = 0x3e, WINED3D_SM4_OP_RSQ = 0x44, + WINED3D_SM4_OP_SAMPLE = 0x45, WINED3D_SM4_OP_SINCOS = 0x4d, }; @@ -147,6 +148,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_MUL, WINED3DSIH_MUL, 1, 2}, {WINED3D_SM4_OP_RET, WINED3DSIH_RET, 0, 0}, {WINED3D_SM4_OP_RSQ, WINED3DSIH_RSQ, 1, 1}, + {WINED3D_SM4_OP_SAMPLE, WINED3DSIH_SAMPLE, 1, 3}, {WINED3D_SM4_OP_SINCOS, WINED3DSIH_SINCOS, 2, 1}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9116687..7af33ac 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -467,6 +467,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_REP, WINED3DSIH_RET, WINED3DSIH_RSQ, + WINED3DSIH_SAMPLE, WINED3DSIH_SETP, WINED3DSIH_SGE, WINED3DSIH_SGN,

1 0

Henri Verbeet : wined3d: Recognize the SM4 sample_l opcode.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: 18d7a73af8153de281ad7f3dc8b5f01ba701cd28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18d7a73af8153de281ad7f3dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 11 13:06:18 2010 +0200 wined3d: Recognize the SM4 sample_l opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 122 +++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 66 insertions(+), 60 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 46462a3..e4eb02a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4996,6 +4996,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_RET */ shader_hw_ret, /* WINED3DSIH_RSQ */ shader_hw_scalar_op, /* WINED3DSIH_SAMPLE */ NULL, + /* WINED3DSIH_SAMPLE_LOD */ NULL, /* WINED3DSIH_SETP */ NULL, /* WINED3DSIH_SGE */ shader_hw_map2gl, /* WINED3DSIH_SGN */ shader_hw_sgn, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3efff9a..fd0b853 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5054,6 +5054,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_RET */ shader_glsl_ret, /* WINED3DSIH_RSQ */ shader_glsl_rsq, /* WINED3DSIH_SAMPLE */ NULL, + /* WINED3DSIH_SAMPLE_LOD */ NULL, /* WINED3DSIH_SETP */ NULL, /* WINED3DSIH_SGE */ shader_glsl_compare, /* WINED3DSIH_SGN */ shader_glsl_sgn, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index ff967ce..b7f9a91 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -100,6 +100,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_RET */ "ret", /* WINED3DSIH_RSQ */ "rsq", /* WINED3DSIH_SAMPLE */ "sample", + /* WINED3DSIH_SAMPLE_LOD */ "sample_l", /* WINED3DSIH_SETP */ "setp", /* WINED3DSIH_SGE */ "sge", /* WINED3DSIH_SGN */ "sgn", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index f706b5a..9a02830 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -48,36 +48,37 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); enum wined3d_sm4_opcode { - WINED3D_SM4_OP_ADD = 0x00, - WINED3D_SM4_OP_AND = 0x01, - WINED3D_SM4_OP_BREAK = 0x02, - WINED3D_SM4_OP_BREAKC = 0x03, - WINED3D_SM4_OP_CUT = 0x09, - WINED3D_SM4_OP_DP3 = 0x10, - WINED3D_SM4_OP_DP4 = 0x11, - WINED3D_SM4_OP_EMIT = 0x13, - WINED3D_SM4_OP_ENDIF = 0x15, - WINED3D_SM4_OP_ENDLOOP = 0x16, - WINED3D_SM4_OP_EXP = 0x19, - WINED3D_SM4_OP_FRC = 0x1a, - WINED3D_SM4_OP_IADD = 0x1e, - WINED3D_SM4_OP_IF = 0x1f, - WINED3D_SM4_OP_IGE = 0x21, - WINED3D_SM4_OP_IMUL = 0x26, - WINED3D_SM4_OP_ITOF = 0x2b, - WINED3D_SM4_OP_LOG = 0x2f, - WINED3D_SM4_OP_LOOP = 0x30, - WINED3D_SM4_OP_LT = 0x31, - WINED3D_SM4_OP_MAD = 0x32, - WINED3D_SM4_OP_MIN = 0x33, - WINED3D_SM4_OP_MAX = 0x34, - WINED3D_SM4_OP_MOV = 0x36, - WINED3D_SM4_OP_MOVC = 0x37, - WINED3D_SM4_OP_MUL = 0x38, - WINED3D_SM4_OP_RET = 0x3e, - WINED3D_SM4_OP_RSQ = 0x44, - WINED3D_SM4_OP_SAMPLE = 0x45, - WINED3D_SM4_OP_SINCOS = 0x4d, + WINED3D_SM4_OP_ADD = 0x00, + WINED3D_SM4_OP_AND = 0x01, + WINED3D_SM4_OP_BREAK = 0x02, + WINED3D_SM4_OP_BREAKC = 0x03, + WINED3D_SM4_OP_CUT = 0x09, + WINED3D_SM4_OP_DP3 = 0x10, + WINED3D_SM4_OP_DP4 = 0x11, + WINED3D_SM4_OP_EMIT = 0x13, + WINED3D_SM4_OP_ENDIF = 0x15, + WINED3D_SM4_OP_ENDLOOP = 0x16, + WINED3D_SM4_OP_EXP = 0x19, + WINED3D_SM4_OP_FRC = 0x1a, + WINED3D_SM4_OP_IADD = 0x1e, + WINED3D_SM4_OP_IF = 0x1f, + WINED3D_SM4_OP_IGE = 0x21, + WINED3D_SM4_OP_IMUL = 0x26, + WINED3D_SM4_OP_ITOF = 0x2b, + WINED3D_SM4_OP_LOG = 0x2f, + WINED3D_SM4_OP_LOOP = 0x30, + WINED3D_SM4_OP_LT = 0x31, + WINED3D_SM4_OP_MAD = 0x32, + WINED3D_SM4_OP_MIN = 0x33, + WINED3D_SM4_OP_MAX = 0x34, + WINED3D_SM4_OP_MOV = 0x36, + WINED3D_SM4_OP_MOVC = 0x37, + WINED3D_SM4_OP_MUL = 0x38, + WINED3D_SM4_OP_RET = 0x3e, + WINED3D_SM4_OP_RSQ = 0x44, + WINED3D_SM4_OP_SAMPLE = 0x45, + WINED3D_SM4_OP_SAMPLE_LOD = 0x48, + WINED3D_SM4_OP_SINCOS = 0x4d, }; enum wined3d_sm4_register_type @@ -120,36 +121,37 @@ struct sysval_map static const struct wined3d_sm4_opcode_info opcode_table[] = { - {WINED3D_SM4_OP_ADD, WINED3DSIH_ADD, 1, 2}, - {WINED3D_SM4_OP_AND, WINED3DSIH_AND, 1, 2}, - {WINED3D_SM4_OP_BREAK, WINED3DSIH_BREAK, 0, 0}, - {WINED3D_SM4_OP_BREAKC, WINED3DSIH_BREAKP, 0, 1}, - {WINED3D_SM4_OP_CUT, WINED3DSIH_CUT, 0, 0}, - {WINED3D_SM4_OP_DP3, WINED3DSIH_DP3, 1, 2}, - {WINED3D_SM4_OP_DP4, WINED3DSIH_DP4, 1, 2}, - {WINED3D_SM4_OP_EMIT, WINED3DSIH_EMIT, 0, 0}, - {WINED3D_SM4_OP_ENDIF, WINED3DSIH_ENDIF, 0, 0}, - {WINED3D_SM4_OP_ENDLOOP,WINED3DSIH_ENDLOOP, 0, 0}, - {WINED3D_SM4_OP_EXP, WINED3DSIH_EXP, 1, 1}, - {WINED3D_SM4_OP_FRC, WINED3DSIH_FRC, 1, 1}, - {WINED3D_SM4_OP_IADD, WINED3DSIH_IADD, 1, 2}, - {WINED3D_SM4_OP_IF, WINED3DSIH_IF, 0, 1}, - {WINED3D_SM4_OP_IGE, WINED3DSIH_IGE, 1, 2}, - {WINED3D_SM4_OP_IMUL, WINED3DSIH_IMUL, 2, 2}, - {WINED3D_SM4_OP_ITOF, WINED3DSIH_ITOF, 1, 1}, - {WINED3D_SM4_OP_LOG, WINED3DSIH_LOG, 1, 1}, - {WINED3D_SM4_OP_LOOP, WINED3DSIH_LOOP, 0, 0}, - {WINED3D_SM4_OP_LT, WINED3DSIH_LT, 1, 2}, - {WINED3D_SM4_OP_MAD, WINED3DSIH_MAD, 1, 3}, - {WINED3D_SM4_OP_MIN, WINED3DSIH_MIN, 1, 2}, - {WINED3D_SM4_OP_MAX, WINED3DSIH_MAX, 1, 2}, - {WINED3D_SM4_OP_MOV, WINED3DSIH_MOV, 1, 1}, - {WINED3D_SM4_OP_MOVC, WINED3DSIH_MOVC, 1, 3}, - {WINED3D_SM4_OP_MUL, WINED3DSIH_MUL, 1, 2}, - {WINED3D_SM4_OP_RET, WINED3DSIH_RET, 0, 0}, - {WINED3D_SM4_OP_RSQ, WINED3DSIH_RSQ, 1, 1}, - {WINED3D_SM4_OP_SAMPLE, WINED3DSIH_SAMPLE, 1, 3}, - {WINED3D_SM4_OP_SINCOS, WINED3DSIH_SINCOS, 2, 1}, + {WINED3D_SM4_OP_ADD, WINED3DSIH_ADD, 1, 2}, + {WINED3D_SM4_OP_AND, WINED3DSIH_AND, 1, 2}, + {WINED3D_SM4_OP_BREAK, WINED3DSIH_BREAK, 0, 0}, + {WINED3D_SM4_OP_BREAKC, WINED3DSIH_BREAKP, 0, 1}, + {WINED3D_SM4_OP_CUT, WINED3DSIH_CUT, 0, 0}, + {WINED3D_SM4_OP_DP3, WINED3DSIH_DP3, 1, 2}, + {WINED3D_SM4_OP_DP4, WINED3DSIH_DP4, 1, 2}, + {WINED3D_SM4_OP_EMIT, WINED3DSIH_EMIT, 0, 0}, + {WINED3D_SM4_OP_ENDIF, WINED3DSIH_ENDIF, 0, 0}, + {WINED3D_SM4_OP_ENDLOOP, WINED3DSIH_ENDLOOP, 0, 0}, + {WINED3D_SM4_OP_EXP, WINED3DSIH_EXP, 1, 1}, + {WINED3D_SM4_OP_FRC, WINED3DSIH_FRC, 1, 1}, + {WINED3D_SM4_OP_IADD, WINED3DSIH_IADD, 1, 2}, + {WINED3D_SM4_OP_IF, WINED3DSIH_IF, 0, 1}, + {WINED3D_SM4_OP_IGE, WINED3DSIH_IGE, 1, 2}, + {WINED3D_SM4_OP_IMUL, WINED3DSIH_IMUL, 2, 2}, + {WINED3D_SM4_OP_ITOF, WINED3DSIH_ITOF, 1, 1}, + {WINED3D_SM4_OP_LOG, WINED3DSIH_LOG, 1, 1}, + {WINED3D_SM4_OP_LOOP, WINED3DSIH_LOOP, 0, 0}, + {WINED3D_SM4_OP_LT, WINED3DSIH_LT, 1, 2}, + {WINED3D_SM4_OP_MAD, WINED3DSIH_MAD, 1, 3}, + {WINED3D_SM4_OP_MIN, WINED3DSIH_MIN, 1, 2}, + {WINED3D_SM4_OP_MAX, WINED3DSIH_MAX, 1, 2}, + {WINED3D_SM4_OP_MOV, WINED3DSIH_MOV, 1, 1}, + {WINED3D_SM4_OP_MOVC, WINED3DSIH_MOVC, 1, 3}, + {WINED3D_SM4_OP_MUL, WINED3DSIH_MUL, 1, 2}, + {WINED3D_SM4_OP_RET, WINED3DSIH_RET, 0, 0}, + {WINED3D_SM4_OP_RSQ, WINED3DSIH_RSQ, 1, 1}, + {WINED3D_SM4_OP_SAMPLE, WINED3DSIH_SAMPLE, 1, 3}, + {WINED3D_SM4_OP_SAMPLE_LOD, WINED3DSIH_SAMPLE_LOD, 1, 4}, + {WINED3D_SM4_OP_SINCOS, WINED3DSIH_SINCOS, 2, 1}, }; static const WINED3DSHADER_PARAM_REGISTER_TYPE register_type_table[] = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7af33ac..3e2596e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -468,6 +468,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_RET, WINED3DSIH_RSQ, WINED3DSIH_SAMPLE, + WINED3DSIH_SAMPLE_LOD, WINED3DSIH_SETP, WINED3DSIH_SGE, WINED3DSIH_SGN,

1 0

Henri Verbeet : wined3d: Recognize the SM4 utof opcode.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: ff9c2fcdb2bc03976b7cdd6e111917cc23388607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff9c2fcdb2bc03976b7cdd6e1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 11 13:06:19 2010 +0200 wined3d: Recognize the SM4 utof opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e4eb02a..c609291 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5025,6 +5025,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_TEXREG2AR */ pshader_hw_texreg2ar, /* WINED3DSIH_TEXREG2GB */ pshader_hw_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ pshader_hw_texreg2rgb, + /* WINED3DSIH_UTOF */ NULL, }; static inline BOOL get_bool_const(const struct wined3d_shader_instruction *ins, IWineD3DBaseShaderImpl *This, DWORD idx) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fd0b853..3390848 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5083,6 +5083,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_TEXREG2AR */ shader_glsl_texreg2ar, /* WINED3DSIH_TEXREG2GB */ shader_glsl_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ shader_glsl_texreg2rgb, + /* WINED3DSIH_UTOF */ NULL, }; static void shader_glsl_handle_instruction(const struct wined3d_shader_instruction *ins) { diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b7f9a91..f6546c8 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -129,6 +129,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_TEXREG2AR */ "texreg2ar", /* WINED3DSIH_TEXREG2GB */ "texreg2gb", /* WINED3DSIH_TEXREG2RGB */ "texreg2rgb", + /* WINED3DSIH_UTOF */ "utof", }; static const char * const semantic_names[] = diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 9a02830..1b4dbd5 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -79,6 +79,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_SAMPLE = 0x45, WINED3D_SM4_OP_SAMPLE_LOD = 0x48, WINED3D_SM4_OP_SINCOS = 0x4d, + WINED3D_SM4_OP_UTOF = 0x56, }; enum wined3d_sm4_register_type @@ -152,6 +153,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_SAMPLE, WINED3DSIH_SAMPLE, 1, 3}, {WINED3D_SM4_OP_SAMPLE_LOD, WINED3DSIH_SAMPLE_LOD, 1, 4}, {WINED3D_SM4_OP_SINCOS, WINED3DSIH_SINCOS, 2, 1}, + {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, 1, 1}, }; static const WINED3DSHADER_PARAM_REGISTER_TYPE register_type_table[] = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3e2596e..b291d43 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -497,6 +497,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_TEXREG2AR, WINED3DSIH_TEXREG2GB, WINED3DSIH_TEXREG2RGB, + WINED3DSIH_UTOF, WINED3DSIH_TABLE_SIZE };

1 0

Andrew Nguyen : taskkill: Disallow process self-termination.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: fbcf44aa23f748bb63eb26656e610cbfc3356375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbcf44aa23f748bb63eb26656… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Oct 11 05:13:43 2010 -0500 taskkill: Disallow process self-termination. --- programs/taskkill/En.rc | 1 + programs/taskkill/taskkill.c | 30 ++++++++++++++++++++++++++++++ programs/taskkill/taskkill.h | 1 + 3 files changed, 32 insertions(+), 0 deletions(-) diff --git a/programs/taskkill/En.rc b/programs/taskkill/En.rc index f7fcfd6..b4baabe 100644 --- a/programs/taskkill/En.rc +++ b/programs/taskkill/En.rc @@ -38,4 +38,5 @@ STRINGTABLE STRING_SEARCH_FAILED, "Error: Could not find process \"%s\".\n" STRING_ENUM_FAILED, "Error: Unable to enumerate the process list.\n" STRING_TERMINATE_FAILED, "Error: Unable to terminate process \"%s\".\n" + STRING_SELF_TERMINATION, "Error: Process self-termination is not permitted.\n" } diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 8dffdcd..1dc1fcc 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -204,6 +204,7 @@ static BOOL get_process_name_from_pid(DWORD pid, WCHAR *buf, DWORD chars) static int send_close_messages(void) { DWORD *pid_list, pid_list_size; + DWORD self_pid = GetCurrentProcessId(); unsigned int i; int status_code = 0; @@ -234,6 +235,13 @@ static int send_close_messages(void) DWORD pid = atoiW(task_list[i]); struct pid_close_info info = { pid }; + if (pid == self_pid) + { + taskkill_message(STRING_SELF_TERMINATION); + status_code = 1; + continue; + } + EnumWindows(pid_enum_proc, (LPARAM)&info); if (info.found) taskkill_message_printfW(STRING_CLOSE_PID_SEARCH, pid); @@ -258,6 +266,13 @@ static int send_close_messages(void) struct pid_close_info info = { pid_list[index] }; found_process = TRUE; + if (pid_list[index] == self_pid) + { + taskkill_message(STRING_SELF_TERMINATION); + status_code = 1; + continue; + } + EnumWindows(pid_enum_proc, (LPARAM)&info); taskkill_message_printfW(STRING_CLOSE_PROC_SRCH, process_name, pid_list[index]); } @@ -278,6 +293,7 @@ static int send_close_messages(void) static int terminate_processes(void) { DWORD *pid_list, pid_list_size; + DWORD self_pid = GetCurrentProcessId(); unsigned int i; int status_code = 0; @@ -308,6 +324,13 @@ static int terminate_processes(void) DWORD pid = atoiW(task_list[i]); HANDLE process; + if (pid == self_pid) + { + taskkill_message(STRING_SELF_TERMINATION); + status_code = 1; + continue; + } + process = OpenProcess(PROCESS_TERMINATE, FALSE, pid); if (!process) { @@ -341,6 +364,13 @@ static int terminate_processes(void) { HANDLE process; + if (pid_list[index] == self_pid) + { + taskkill_message(STRING_SELF_TERMINATION); + status_code = 1; + continue; + } + process = OpenProcess(PROCESS_TERMINATE, FALSE, pid_list[index]); if (!process) { diff --git a/programs/taskkill/taskkill.h b/programs/taskkill/taskkill.h index e535a01..7972a15 100644 --- a/programs/taskkill/taskkill.h +++ b/programs/taskkill/taskkill.h @@ -34,3 +34,4 @@ #define STRING_SEARCH_FAILED 111 #define STRING_ENUM_FAILED 112 #define STRING_TERMINATE_FAILED 113 +#define STRING_SELF_TERMINATION 114

1 0

Andrew Nguyen : kernel32: Implement GetSystemRegistryQuota as a semi-stub.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: 43e99d6e0c5c34ea61b48a745ae1d0dc86ef9bd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43e99d6e0c5c34ea61b48a745… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Oct 11 05:16:16 2010 -0500 kernel32: Implement GetSystemRegistryQuota as a semi-stub. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/kernel_main.c | 16 ++++++++++++++++ dlls/kernel32/tests/process.c | 31 +++++++++++++++++++++++++++++++ include/winbase.h | 1 + 4 files changed, 49 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index e4ce77e..8381ae8 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -630,7 +630,7 @@ @ stdcall GetSystemDirectoryW(ptr long) @ stdcall GetSystemInfo(ptr) @ stdcall GetSystemPowerStatus(ptr) -# @ stub GetSystemRegistryQuota +@ stdcall GetSystemRegistryQuota(ptr ptr) @ stdcall GetSystemTime(ptr) @ stdcall GetSystemTimeAdjustment(ptr ptr ptr) @ stdcall GetSystemTimeAsFileTime(ptr) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 42d038e..8bdd1d3 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -207,3 +207,19 @@ DWORD WINAPI GetTickCount(void) { return GetTickCount64(); } + +/****************************************************************************** + * GetSystemRegistryQuota (KERNEL32.@) + */ +BOOL WINAPI GetSystemRegistryQuota(PDWORD pdwQuotaAllowed, PDWORD pdwQuotaUsed) +{ + FIXME("(%p, %p) faking reported quota values\n", pdwQuotaAllowed, pdwQuotaUsed); + + if (pdwQuotaAllowed) + *pdwQuotaAllowed = 2 * 1000 * 1000 * 1000; /* 2 GB */ + + if (pdwQuotaUsed) + *pdwQuotaUsed = 100 * 1000 * 1000; /* 100 MB */ + + return TRUE; +} diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 77a303c..76cc3ed 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -56,6 +56,7 @@ static HINSTANCE hkernel32; static void (WINAPI *pGetNativeSystemInfo)(LPSYSTEM_INFO); +static BOOL (WINAPI *pGetSystemRegistryQuota)(PDWORD, PDWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); static LPVOID (WINAPI *pVirtualAllocEx)(HANDLE, LPVOID, SIZE_T, DWORD, DWORD); static BOOL (WINAPI *pVirtualFreeEx)(HANDLE, LPVOID, SIZE_T, DWORD); @@ -197,6 +198,7 @@ static int init(void) hkernel32 = GetModuleHandleA("kernel32"); pGetNativeSystemInfo = (void *) GetProcAddress(hkernel32, "GetNativeSystemInfo"); + pGetSystemRegistryQuota = (void *) GetProcAddress(hkernel32, "GetSystemRegistryQuota"); pIsWow64Process = (void *) GetProcAddress(hkernel32, "IsWow64Process"); pVirtualAllocEx = (void *) GetProcAddress(hkernel32, "VirtualAllocEx"); pVirtualFreeEx = (void *) GetProcAddress(hkernel32, "VirtualFreeEx"); @@ -1831,6 +1833,34 @@ static void test_SystemInfo(void) } } +static void test_RegistryQuota(void) +{ + BOOL ret; + DWORD max_quota, used_quota; + + if (!pGetSystemRegistryQuota) + { + win_skip("GetSystemRegistryQuota is not available\n"); + return; + } + + ret = pGetSystemRegistryQuota(NULL, NULL); + ok(ret == TRUE, + "Expected GetSystemRegistryQuota to return TRUE, got %d\n", ret); + + ret = pGetSystemRegistryQuota(&max_quota, NULL); + ok(ret == TRUE, + "Expected GetSystemRegistryQuota to return TRUE, got %d\n", ret); + + ret = pGetSystemRegistryQuota(NULL, &used_quota); + ok(ret == TRUE, + "Expected GetSystemRegistryQuota to return TRUE, got %d\n", ret); + + ret = pGetSystemRegistryQuota(&max_quota, &used_quota); + ok(ret == TRUE, + "Expected GetSystemRegistryQuota to return TRUE, got %d\n", ret); +} + START_TEST(process) { int b = init(); @@ -1856,6 +1886,7 @@ START_TEST(process) test_ProcessName(); test_Handles(); test_SystemInfo(); + test_RegistryQuota(); /* things that can be tested: * lookup: check the way program to be executed is searched * handles: check the handle inheritance stuff (+sec options) diff --git a/include/winbase.h b/include/winbase.h index 24f6f33..05f3a2a 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1755,6 +1755,7 @@ WINBASEAPI UINT WINAPI GetSystemDirectoryW(LPWSTR,UINT); #define GetSystemDirectory WINELIB_NAME_AW(GetSystemDirectory) WINBASEAPI VOID WINAPI GetSystemInfo(LPSYSTEM_INFO); WINBASEAPI BOOL WINAPI GetSystemPowerStatus(LPSYSTEM_POWER_STATUS); +WINBASEAPI BOOL WINAPI GetSystemRegistryQuota(PDWORD,PDWORD); WINBASEAPI VOID WINAPI GetSystemTime(LPSYSTEMTIME); WINBASEAPI BOOL WINAPI GetSystemTimeAdjustment(PDWORD,PDWORD,PBOOL); WINBASEAPI VOID WINAPI GetSystemTimeAsFileTime(LPFILETIME);

1 0

Andrew Nguyen : kernel32: Make the return type of LoadModule match the Windows SDK.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: 6d605e68f4366ab06f33732a344cebdcf73c72c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d605e68f4366ab06f33732a3… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Oct 11 05:16:51 2010 -0500 kernel32: Make the return type of LoadModule match the Windows SDK. --- dlls/kernel32/process.c | 20 ++++++++++---------- include/winbase.h | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index d4c2063..fdd19db 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2297,25 +2297,25 @@ UINT WINAPI WinExec( LPCSTR lpCmdLine, UINT nCmdShow ) /********************************************************************** * LoadModule (KERNEL32.@) */ -HINSTANCE WINAPI LoadModule( LPCSTR name, LPVOID paramBlock ) +DWORD WINAPI LoadModule( LPCSTR name, LPVOID paramBlock ) { LOADPARMS32 *params = paramBlock; PROCESS_INFORMATION info; STARTUPINFOA startup; - HINSTANCE hInstance; + DWORD ret; LPSTR cmdline, p; char filename[MAX_PATH]; BYTE len; - if (!name) return (HINSTANCE)ERROR_FILE_NOT_FOUND; + if (!name) return ERROR_FILE_NOT_FOUND; if (!SearchPathA( NULL, name, ".exe", sizeof(filename), filename, NULL ) && !SearchPathA( NULL, name, NULL, sizeof(filename), filename, NULL )) - return ULongToHandle(GetLastError()); + return GetLastError(); len = (BYTE)params->lpCmdLine[0]; if (!(cmdline = HeapAlloc( GetProcessHeap(), 0, strlen(filename) + len + 2 ))) - return (HINSTANCE)ERROR_NOT_ENOUGH_MEMORY; + return ERROR_NOT_ENOUGH_MEMORY; strcpy( cmdline, filename ); p = cmdline + strlen(cmdline); @@ -2337,19 +2337,19 @@ HINSTANCE WINAPI LoadModule( LPCSTR name, LPVOID paramBlock ) /* Give 30 seconds to the app to come up */ if (wait_input_idle( info.hProcess, 30000 ) == WAIT_FAILED) WARN("WaitForInputIdle failed: Error %d\n", GetLastError() ); - hInstance = (HINSTANCE)33; + ret = 33; /* Close off the handles */ CloseHandle( info.hThread ); CloseHandle( info.hProcess ); } - else if ((hInstance = ULongToHandle(GetLastError())) >= (HINSTANCE)32) + else if ((ret = GetLastError()) >= 32) { - FIXME("Strange error set by CreateProcess: %p\n", hInstance ); - hInstance = (HINSTANCE)11; + FIXME("Strange error set by CreateProcess: %u\n", ret ); + ret = 11; } HeapFree( GetProcessHeap(), 0, cmdline ); - return hInstance; + return ret; } diff --git a/include/winbase.h b/include/winbase.h index 05f3a2a..a233a0a 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1887,7 +1887,7 @@ WINBASEAPI HMODULE WINAPI LoadLibraryW(LPCWSTR); WINBASEAPI HMODULE WINAPI LoadLibraryExA(LPCSTR,HANDLE,DWORD); WINBASEAPI HMODULE WINAPI LoadLibraryExW(LPCWSTR,HANDLE,DWORD); #define LoadLibraryEx WINELIB_NAME_AW(LoadLibraryEx) -WINBASEAPI HINSTANCE WINAPI LoadModule(LPCSTR,LPVOID); +WINBASEAPI DWORD WINAPI LoadModule(LPCSTR,LPVOID); WINBASEAPI HGLOBAL WINAPI LoadResource(HMODULE,HRSRC); WINBASEAPI HLOCAL WINAPI LocalAlloc(UINT,SIZE_T) __WINE_ALLOC_SIZE(2); WINBASEAPI SIZE_T WINAPI LocalCompact(UINT);

1 0

Andrew Nguyen : winex11.drv: Use a separate string buffer for X11R6 font check.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: 093ae8b691a9fc295eb806164d377a072477a810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=093ae8b691a9fc295eb806164… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Oct 11 05:19:19 2010 -0500 winex11.drv: Use a separate string buffer for X11R6 font check. --- dlls/winex11.drv/xfont.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index aa3eb76..374590b 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -2893,7 +2893,8 @@ static void X11DRV_FONT_InitX11Metrics( void ) int i, x_count, buf_size; char *buffer; HKEY hkey; - + XFontStruct* x_fs; + char fontcheck_name[] = "-*-*-*-*-normal-*-[12 0 0 12]-*-72-*-*-*-iso8859-1"; wine_tsx11_lock(); x_pattern = XListFonts(gdi_display, "*", MAX_FONTS, &x_count ); @@ -2966,15 +2967,12 @@ static void X11DRV_FONT_InitX11Metrics( void ) XFreeFontNames(x_pattern); /* check if we're dealing with X11 R6 server */ + if( (x_fs = safe_XLoadQueryFont(gdi_display, fontcheck_name)) ) { - XFontStruct* x_fs; - strcpy(buffer, "-*-*-*-*-normal-*-[12 0 0 12]-*-72-*-*-*-iso8859-1"); - if( (x_fs = safe_XLoadQueryFont(gdi_display, buffer)) ) - { - text_caps |= TC_SF_X_YINDEP; - XFreeFont(gdi_display, x_fs); - } + text_caps |= TC_SF_X_YINDEP; + XFreeFont(gdi_display, x_fs); } + wine_tsx11_unlock(); HeapFree(GetProcessHeap(), 0, buffer);

1 0

Andrew Nguyen : winex11.drv: Avoid relying on PATH_MAX in X11DRV_FONT_InitX11Metrics helper.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: f340b64fb892c54bc3ccb95b8ff60ab92c3d3025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f340b64fb892c54bc3ccb95b8… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Oct 11 05:19:52 2010 -0500 winex11.drv: Avoid relying on PATH_MAX in X11DRV_FONT_InitX11Metrics helper. --- dlls/winex11.drv/xfont.c | 67 ++++++++++++++++++++++----------------------- 1 files changed, 33 insertions(+), 34 deletions(-) diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index 374590b..307ee09 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -1824,21 +1824,20 @@ static void XFONT_LoadIgnores( HKEY hkey ) * Returns expanded name for the cachedmetrics file. * Now it also appends the current value of the $DISPLAY variable. */ -static char* XFONT_UserMetricsCache( char* buffer, int* buf_size ) +static char* XFONT_UserMetricsCache(void) { const char *confdir = wine_get_config_dir(); const char *display_name = XDisplayName(NULL); int len = strlen(confdir) + strlen(INIFontMetrics) + strlen(display_name) + 8; + char *buffer; unsigned int display = 0; unsigned int screen = 0; char *p, *ext; - - if ((len > *buf_size) && - !(buffer = HeapReAlloc( GetProcessHeap(), 0, buffer, *buf_size = len ))) + if (!(buffer = HeapAlloc(GetProcessHeap(), 0, len))) { ERR("out of memory\n"); - ExitProcess(1); + return NULL; } sprintf( buffer, "%s/%s", confdir, INIFontMetrics ); @@ -2890,9 +2889,9 @@ static void X11DRV_FONT_InitX11Metrics( void ) { char** x_pattern; unsigned x_checksum; - int i, x_count, buf_size; - char *buffer; - HKEY hkey; + int i, x_count; + char *buffer = NULL; + HKEY hkey = NULL; XFontStruct* x_fs; char fontcheck_name[] = "-*-*-*-*-normal-*-[12 0 0 12]-*-72-*-*-*-iso8859-1"; @@ -2907,48 +2906,48 @@ static void X11DRV_FONT_InitX11Metrics( void ) for( i = x_checksum = 0; i < x_count; i++ ) { int j; -#if 0 - printf("%i\t: %s\n", i, x_pattern[i] ); -#endif j = strlen( x_pattern[i] ); if( j ) x_checksum ^= __genericCheckSum( x_pattern[i], j ); } x_checksum |= X_PFONT_MAGIC; - buf_size = PATH_MAX; - buffer = HeapAlloc( GetProcessHeap(), 0, buf_size ); /* deal with systemwide font metrics cache */ - buffer[0] = 0; /* @@ Wine registry key: HKCU\Software\Wine\X11 Driver\Fonts */ - if (RegOpenKeyA(HKEY_CURRENT_USER, INIFontSection, &hkey)) hkey = 0; - if (hkey) + if (RegOpenKeyA(HKEY_CURRENT_USER, INIFontSection, &hkey) == ERROR_SUCCESS) { - DWORD type, count = buf_size; - RegQueryValueExA(hkey, INIGlobalMetrics, 0, &type, (LPBYTE)buffer, &count); + DWORD type, count = 0; + if (RegQueryValueExA(hkey, INIGlobalMetrics, NULL, &type, NULL, &count) == ERROR_SUCCESS && + type == REG_SZ) + { + buffer = HeapAlloc(GetProcessHeap(), 0, count + 1); + if (RegQueryValueExA(hkey, INIGlobalMetrics, NULL, NULL, (LPBYTE)buffer, &count) == ERROR_SUCCESS) + { + buffer[count] = '\0'; + TRACE("system fontcache is '%s'\n", buffer); + XFONT_ReadCachedMetrics(buffer, DefResolution, x_checksum, x_count); + } + HeapFree(GetProcessHeap(), 0, buffer); + buffer = NULL; + } } - if( buffer[0] ) - { - TRACE("system fontcache is '%s'\n", buffer); - XFONT_ReadCachedMetrics(buffer, DefResolution, x_checksum, x_count); - } if (fontList == NULL) { - /* try per-user */ - buffer = XFONT_UserMetricsCache( buffer, &buf_size ); - if( buffer[0] ) - { - TRACE("user fontcache is '%s'\n", buffer); - XFONT_ReadCachedMetrics(buffer, DefResolution, x_checksum, x_count); - } + /* try per-user */ + buffer = XFONT_UserMetricsCache(); + if (buffer) + { + TRACE("user fontcache is '%s'\n", buffer); + XFONT_ReadCachedMetrics(buffer, DefResolution, x_checksum, x_count); + } } - if( fontList == NULL ) /* build metrics from scratch */ + if (fontList == NULL) /* build metrics from scratch */ { int n_ff = XFONT_BuildMetrics(x_pattern, DefResolution, x_checksum, x_count); - if( buffer[0] ) /* update cached metrics */ + if( buffer ) /* update cached metrics */ { int fd = open( buffer, O_CREAT | O_TRUNC | O_RDWR, 0666 ); if ( fd < 0 ) @@ -2963,6 +2962,8 @@ static void X11DRV_FONT_InitX11Metrics( void ) } } + HeapFree(GetProcessHeap(), 0, buffer); + wine_tsx11_lock(); XFreeFontNames(x_pattern); @@ -2975,8 +2976,6 @@ static void X11DRV_FONT_InitX11Metrics( void ) wine_tsx11_unlock(); - HeapFree(GetProcessHeap(), 0, buffer); - XFONT_WindowsNames(); XFONT_LoadAliases( hkey ); if (hkey) XFONT_LoadDefaults( hkey );

1 0