wine-commits March 2012

wine-commits@winehq.org

3 participants
710 discussions

Stefan Leichter : mgmtapi: New stub dll.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: f91c9cc44a93fcc0779ea5c3a256c0fdec052387 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f91c9cc44a93fcc0779ea5c3a… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri Mar 9 00:31:49 2012 +0100 mgmtapi: New stub dll. --- configure | 1 + configure.ac | 1 + dlls/mgmtapi/Makefile.in | 5 +++++ dlls/mgmtapi/mgmtapi.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/mgmtapi/mgmtapi.spec | 9 +++++++++ 5 files changed, 57 insertions(+), 0 deletions(-) diff --git a/configure b/configure index fc75580..3a62558 100755 --- a/configure +++ b/configure @@ -15115,6 +15115,7 @@ wine_fn_config_dll mcicda enable_mcicda wine_fn_config_dll mciqtz32 enable_mciqtz32 wine_fn_config_dll mciseq enable_mciseq wine_fn_config_dll mciwave enable_mciwave +wine_fn_config_dll mgmtapi enable_mgmtapi wine_fn_config_dll midimap enable_midimap wine_fn_config_dll mlang enable_mlang implib wine_fn_config_test dlls/mlang/tests mlang_test diff --git a/configure.ac b/configure.ac index 63c2fb4..472ef12 100644 --- a/configure.ac +++ b/configure.ac @@ -2624,6 +2624,7 @@ WINE_CONFIG_DLL(mcicda) WINE_CONFIG_DLL(mciqtz32) WINE_CONFIG_DLL(mciseq) WINE_CONFIG_DLL(mciwave) +WINE_CONFIG_DLL(mgmtapi) WINE_CONFIG_DLL(midimap) WINE_CONFIG_DLL(mlang,,[implib]) WINE_CONFIG_TEST(dlls/mlang/tests) diff --git a/dlls/mgmtapi/Makefile.in b/dlls/mgmtapi/Makefile.in new file mode 100644 index 0000000..fde16ae --- /dev/null +++ b/dlls/mgmtapi/Makefile.in @@ -0,0 +1,5 @@ +MODULE = mgmtapi.dll + +C_SRCS = mgmtapi.c + +@MAKE_DLL_RULES@ diff --git a/dlls/mgmtapi/mgmtapi.c b/dlls/mgmtapi/mgmtapi.c new file mode 100644 index 0000000..0cde5d5 --- /dev/null +++ b/dlls/mgmtapi/mgmtapi.c @@ -0,0 +1,41 @@ +/* + * Copyright 2012 Stefan Leichter + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mgmtapi); + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + TRACE("%p, %u, %p\n", hinst, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} diff --git a/dlls/mgmtapi/mgmtapi.spec b/dlls/mgmtapi/mgmtapi.spec new file mode 100644 index 0000000..9166cd4 --- /dev/null +++ b/dlls/mgmtapi/mgmtapi.spec @@ -0,0 +1,9 @@ +@ stub SnmpMgrClose +@ stub SnmpMgrCtl +@ stub SnmpMgrGetTrap +@ stub SnmpMgrGetTrapEx +@ stub SnmpMgrOidToStr +@ stub SnmpMgrOpen +@ stub SnmpMgrrequest +@ stub SnmpMgrStrToOid +@ stub SnmpMgrTrapListen

1 0

Austin English : wusa: Add stub program.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: bec293f3ffe4c62dd83af9ff622ce961e8e2e79b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bec293f3ffe4c62dd83af9ff6… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Mar 4 14:34:36 2012 -0800 wusa: Add stub program. --- configure | 1 + configure.ac | 1 + programs/wusa/Makefile.in | 7 +++++++ programs/wusa/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 045d4f5..fc75580 100755 --- a/configure +++ b/configure @@ -15510,6 +15510,7 @@ wine_fn_config_program wordpad enable_wordpad install,po wine_fn_config_program write enable_write install,po wine_fn_config_program wscript enable_wscript install wine_fn_config_test programs/wscript/tests wscript.exe_test +wine_fn_config_program wusa enable_wusa install wine_fn_config_program xcopy enable_xcopy install,po wine_fn_config_makefile server enable_server install-lib,manpage wine_fn_config_tool tools install-dev,install-lib,manpage diff --git a/configure.ac b/configure.ac index 27db29c..63c2fb4 100644 --- a/configure.ac +++ b/configure.ac @@ -3019,6 +3019,7 @@ WINE_CONFIG_PROGRAM(wordpad,,[install,po]) WINE_CONFIG_PROGRAM(write,,[install,po]) WINE_CONFIG_PROGRAM(wscript,,[install]) WINE_CONFIG_TEST(programs/wscript/tests) +WINE_CONFIG_PROGRAM(wusa,,[install]) WINE_CONFIG_PROGRAM(xcopy,,[install,po]) WINE_CONFIG_MAKEFILE([server],,[install-lib,manpage]) WINE_CONFIG_TOOL(tools,[install-dev,install-lib,manpage]) diff --git a/programs/wusa/Makefile.in b/programs/wusa/Makefile.in new file mode 100644 index 0000000..01978d5 --- /dev/null +++ b/programs/wusa/Makefile.in @@ -0,0 +1,7 @@ +MODULE = wusa.exe +APPMODE = -mconsole -municode + +C_SRCS = \ + main.c + +@MAKE_PROG_RULES@ diff --git a/programs/wusa/main.c b/programs/wusa/main.c new file mode 100644 index 0000000..aa7a38f --- /dev/null +++ b/programs/wusa/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2012 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wusa); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Kusanagi Kouichi : gdi32: find_face_from_filename() needs to take font replacements into account.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 6a49adeee6f889913bc960ce3483d83a1d777ee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a49adeee6f889913bc960ce3… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Wed Mar 14 21:01:49 2012 +0900 gdi32: find_face_from_filename() needs to take font replacements into account. --- dlls/gdi32/freetype.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 4d4a37d..ec39814 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -890,6 +890,14 @@ static inline FT_Fixed FT_FixedFromFIXED(FIXED f) } +static const struct list *get_face_list_from_family(const Family *family) +{ + if (!list_empty(&family->faces)) + return &family->faces; + else + return family->replacement; +} + static Face *find_face_from_filename(const WCHAR *file_name, const WCHAR *face_name) { Family *family; @@ -903,9 +911,11 @@ static Face *find_face_from_filename(const WCHAR *file_name, const WCHAR *face_n LIST_FOR_EACH_ENTRY(family, &font_list, Family, entry) { + const struct list *face_list; if(face_name && strcmpiW(face_name, family->FamilyName)) continue; - LIST_FOR_EACH_ENTRY(face, &family->faces, Face, entry) + face_list = get_face_list_from_family(family); + LIST_FOR_EACH_ENTRY(face, face_list, Face, entry) { if (!face->file) continue; @@ -1957,14 +1967,6 @@ static SYSTEM_LINKS *find_font_link(const WCHAR *name) return NULL; } -static const struct list *get_face_list_from_family(const Family *family) -{ - if (!list_empty(&family->faces)) - return &family->faces; - else - return family->replacement; -} - static void populate_system_links(const WCHAR *name, const WCHAR *const *values) { const WCHAR *value;

1 0

Akihiro Sagawa : msvcrt: Add support for _flushall to clear all input buffer.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: cf7479ca85924eb754857ea2ff8509606f10c1d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf7479ca85924eb754857ea2f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 12 21:14:07 2012 +0900 msvcrt: Add support for _flushall to clear all input buffer. --- dlls/msvcrt/file.c | 4 ++-- dlls/msvcrt/tests/file.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b057f9e..1c56eee 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -780,7 +780,7 @@ static int msvcrt_flush_all_buffers(int mask) */ int CDECL MSVCRT__flushall(void) { - return msvcrt_flush_all_buffers(MSVCRT__IOWRT); + return msvcrt_flush_all_buffers(MSVCRT__IOWRT | MSVCRT__IOREAD); } /********************************************************************* @@ -789,7 +789,7 @@ int CDECL MSVCRT__flushall(void) int CDECL MSVCRT_fflush(MSVCRT_FILE* file) { if(!file) { - MSVCRT__flushall(); + msvcrt_flush_all_buffers(MSVCRT__IOWRT); } else if(file->_flag & MSVCRT__IOWRT) { int res; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 6d745d9..0f94083 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -635,7 +635,7 @@ static void test_fflush( void ) ok(ret >= 0, "unexpected ret %d\n", ret); memset(buf2, '?', sizeof(buf2)); fread(buf2, 1, sizeof(buf2), tempfh); - todo_wine ok(memcmp(buf1, buf2, sizeof(buf1)) == 0, "Got unexpected data (%c)\n", buf2[0]); + ok(memcmp(buf1, buf2, sizeof(buf1)) == 0, "Got unexpected data (%c)\n", buf2[0]); fclose(tempfh);

1 0

Akihiro Sagawa : msvcrt: Add a helper function to flush all buffers.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 58d6a9a331811312968077c77a9805ab85c35afe URL: http://source.winehq.org/git/wine.git/?a=commit;h=58d6a9a331811312968077c77… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 12 21:14:06 2012 +0900 msvcrt: Add a helper function to flush all buffers. --- dlls/msvcrt/file.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 7fbe07e..b057f9e 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -748,13 +748,11 @@ int CDECL MSVCRT__wunlink(const MSVCRT_wchar_t *path) return -1; } -/* _flushall calls MSVCRT_fflush which calls _flushall */ +/* flush_all_buffers calls MSVCRT_fflush which calls flush_all_buffers */ int CDECL MSVCRT_fflush(MSVCRT_FILE* file); -/********************************************************************* - * _flushall (MSVCRT.@) - */ -int CDECL MSVCRT__flushall(void) +/* INTERNAL: Flush all stream buffer */ +static int msvcrt_flush_all_buffers(int mask) { int i, num_flushed = 0; MSVCRT_FILE *file; @@ -765,7 +763,7 @@ int CDECL MSVCRT__flushall(void) if (file->_flag) { - if(file->_flag & MSVCRT__IOWRT) { + if(file->_flag & mask) { MSVCRT_fflush(file); num_flushed++; } @@ -778,6 +776,14 @@ int CDECL MSVCRT__flushall(void) } /********************************************************************* + * _flushall (MSVCRT.@) + */ +int CDECL MSVCRT__flushall(void) +{ + return msvcrt_flush_all_buffers(MSVCRT__IOWRT); +} + +/********************************************************************* * fflush (MSVCRT.@) */ int CDECL MSVCRT_fflush(MSVCRT_FILE* file)

1 0

Akihiro Sagawa : msvcrt: Add support for fflush to clear an input buffer.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 1a01893c746beff8b41b7ad9c78df47ced89a012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a01893c746beff8b41b7ad9c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 12 21:14:04 2012 +0900 msvcrt: Add support for fflush to clear an input buffer. --- dlls/msvcrt/file.c | 7 +++++++ dlls/msvcrt/tests/file.c | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c15e33f..7fbe07e 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -792,6 +792,13 @@ int CDECL MSVCRT_fflush(MSVCRT_FILE* file) MSVCRT__unlock_file(file); return res; + } else if(file->_flag & MSVCRT__IOREAD) { + MSVCRT__lock_file(file); + file->_cnt = 0; + file->_ptr = file->_base; + MSVCRT__unlock_file(file); + + return 0; } return 0; } diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 9e93234..6d745d9 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -619,7 +619,7 @@ static void test_fflush( void ) ok(ret == 0, "expected 0, got %d\n", ret); memset(buf2, '?', sizeof(buf2)); fread(buf2, 1, sizeof(buf2), tempfh); - todo_wine ok(memcmp(buf1, buf2, sizeof(buf1)) == 0, "Got unexpected data (%c)\n", buf2[0]); + ok(memcmp(buf1, buf2, sizeof(buf1)) == 0, "Got unexpected data (%c)\n", buf2[0]); /* fflush(NULL) doesn't clear input buffer. */ _lseek(_fileno(tempfh), 0, SEEK_SET);

1 0

Akihiro Sagawa : msvcrt/tests: Add tests for fflush on input stream.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 09a7f8c196f3416becbfc4f1500b733e06040e20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09a7f8c196f3416becbfc4f15… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 12 21:14:03 2012 +0900 msvcrt/tests: Add tests for fflush on input stream. --- dlls/msvcrt/tests/file.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index b9b904d..9e93234 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -591,6 +591,58 @@ static void test_flsbuf( void ) free(tempf); } +static void test_fflush( void ) +{ + static const char obuf[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; + char buf1[16], buf2[24]; + char *tempf; + FILE *tempfh; + int ret; + + tempf=_tempnam(".","wne"); + + /* Prepare the file. */ + tempfh = fopen(tempf,"wb"); + ok(tempfh != NULL, "Can't open test file.\n"); + fwrite(obuf, 1, sizeof(obuf), tempfh); + fclose(tempfh); + + /* Open the file for input. */ + tempfh = fopen(tempf,"rb"); + ok(tempfh != NULL, "Can't open test file.\n"); + fread(buf1, 1, sizeof(buf1), tempfh); + + /* Using fflush() on input stream is undefined in ANSI. + * But MSDN says that it clears input buffer. */ + _lseek(_fileno(tempfh), 0, SEEK_SET); + ret = fflush(tempfh); + ok(ret == 0, "expected 0, got %d\n", ret); + memset(buf2, '?', sizeof(buf2)); + fread(buf2, 1, sizeof(buf2), tempfh); + todo_wine ok(memcmp(buf1, buf2, sizeof(buf1)) == 0, "Got unexpected data (%c)\n", buf2[0]); + + /* fflush(NULL) doesn't clear input buffer. */ + _lseek(_fileno(tempfh), 0, SEEK_SET); + ret = fflush(NULL); + ok(ret == 0, "expected 0, got %d\n", ret); + memset(buf2, '?', sizeof(buf2)); + fread(buf2, 1, sizeof(buf2), tempfh); + ok(memcmp(buf1, buf2, sizeof(buf1)) != 0, "Got unexpected data (%c)\n", buf2[0]); + + /* _flushall() clears input buffer. */ + _lseek(_fileno(tempfh), 0, SEEK_SET); + ret = _flushall(); + ok(ret >= 0, "unexpected ret %d\n", ret); + memset(buf2, '?', sizeof(buf2)); + fread(buf2, 1, sizeof(buf2), tempfh); + todo_wine ok(memcmp(buf1, buf2, sizeof(buf1)) == 0, "Got unexpected data (%c)\n", buf2[0]); + + fclose(tempfh); + + unlink(tempf); + free(tempf); +} + static void test_fgetwc( void ) { #define LLEN 512 @@ -1582,6 +1634,7 @@ START_TEST(file) test_fgetc(); test_fputc(); test_flsbuf(); + test_fflush(); test_fgetwc(); test_ctrlz(); test_file_put_get();

1 0

Christian Costa : attrib: Make command accept several arguments.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: d59538f977819149b152f508a366892003c5d919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d59538f977819149b152f508a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 12 19:51:56 2012 +0100 attrib: Make command accept several arguments. --- programs/attrib/attrib.c | 73 +++++++++++++++++++++++++--------------------- 1 files changed, 40 insertions(+), 33 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index eb497ee..9846c5e 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -1,7 +1,7 @@ /* * ATTRIB - Wine-compatible attrib program * - * Copyright 2010-2011 Christian Costa + * Copyright 2010-2012 Christian Costa * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -29,7 +29,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(attrib); * Load a string from the resource file, handling any error * Returns string retrieved from resource file * ========================================================================= */ -static WCHAR *ATTRIB_LoadMessage(UINT id) { +static WCHAR *ATTRIB_LoadMessage(UINT id) +{ static WCHAR msg[MAXSTRING]; const WCHAR failedMsg[] = {'F', 'a', 'i', 'l', 'e', 'd', '!', 0}; @@ -45,8 +46,8 @@ static WCHAR *ATTRIB_LoadMessage(UINT id) { * and hence required WriteConsoleW to output it, however if file i/o is * redirected, it needs to be WriteFile'd using OEM (not ANSI) format * ========================================================================= */ -static int __cdecl ATTRIB_wprintf(const WCHAR *format, ...) { - +static int __cdecl ATTRIB_wprintf(const WCHAR *format, ...) +{ static WCHAR *output_bufW = NULL; static char *output_bufA = NULL; static BOOL toConsole = TRUE; @@ -128,43 +129,49 @@ int wmain(int argc, WCHAR *argv[]) WIN32_FIND_DATAW fd; WCHAR flags[] = {' ',' ',' ',' ',' ',' ',' ',' ','\0'}; WCHAR name[128]; - WCHAR *param = argc >= 2 ? argv[1] : NULL; DWORD attrib_set = 0; DWORD attrib_clear = 0; - WCHAR help_option[] = {'/','?','\0'}; + const WCHAR help_option[] = {'/','?','\0'}; + const WCHAR slashStarW[] = {'\\','*','\0'}; + int i = 1; - if (param && !strcmpW(param, help_option)) - { + if ((argc >= 2) && !strcmpW(argv[1], help_option)) { ATTRIB_wprintf(ATTRIB_LoadMessage(STRING_HELP)); return 0; } - if (param && (param[0] == '+' || param[0] == '-')) { - DWORD attrib = 0; - /* FIXME: the real cmd can handle many more than two args; this should be in a loop */ - switch (param[1]) { - case 'H': case 'h': attrib |= FILE_ATTRIBUTE_HIDDEN; break; - case 'S': case 's': attrib |= FILE_ATTRIBUTE_SYSTEM; break; - case 'R': case 'r': attrib |= FILE_ATTRIBUTE_READONLY; break; - case 'A': case 'a': attrib |= FILE_ATTRIBUTE_ARCHIVE; break; - default: - ATTRIB_wprintf(ATTRIB_LoadMessage(STRING_NYI)); - return 0; - } - switch (param[0]) { - case '+': attrib_set = attrib; break; - case '-': attrib_clear = attrib; break; + /* By default all files from current directory are taken into account */ + GetCurrentDirectoryW(sizeof(name)/sizeof(WCHAR), name); + strcatW (name, slashStarW); + + while (i < argc) { + WCHAR *param = argv[i++]; + if ((param[0] == '+') || (param[0] == '-')) { + DWORD attrib = 0; + switch (param[1]) { + case 'H': case 'h': attrib |= FILE_ATTRIBUTE_HIDDEN; break; + case 'S': case 's': attrib |= FILE_ATTRIBUTE_SYSTEM; break; + case 'R': case 'r': attrib |= FILE_ATTRIBUTE_READONLY; break; + case 'A': case 'a': attrib |= FILE_ATTRIBUTE_ARCHIVE; break; + default: + ATTRIB_wprintf(ATTRIB_LoadMessage(STRING_NYI)); + return 0; + } + switch (param[0]) { + case '+': attrib_set = attrib; break; + case '-': attrib_clear = attrib; break; + } + } else if (param[0] == '/') { + if (((param[1] == 'D') || (param[1] == 'd')) && !param[2]) { + WINE_FIXME("Option /D not yet supported\n"); + } else if (((param[1] == 'R') || (param[1] == 'r')) && !param[2]) { + WINE_FIXME("Option /R not yet supported\n"); + } else { + WINE_FIXME("Unrecognize option\n"); + } + } else if (param[0]) { + strcpyW(name, param); } - param = argc >= 3 ? argv[2] : NULL; - } - - if (!param || strlenW(param) == 0) { - static const WCHAR slashStarW[] = {'\\','*','\0'}; - - GetCurrentDirectoryW(sizeof(name)/sizeof(WCHAR), name); - strcatW (name, slashStarW); - } else { - strcpyW(name, param); } hff = FindFirstFileW(name, &fd);

1 0

Christian Costa : d3dx9_36: Make D3DXVec3Unproject support omission of world matrix + test.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: a7692beb613f6eff6e93aca365f10edc7e826701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7692beb613f6eff6e93aca36… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 12 19:53:24 2012 +0100 d3dx9_36: Make D3DXVec3Unproject support omission of world matrix + test. --- dlls/d3dx9_36/math.c | 8 ++++++-- dlls/d3dx9_36/tests/math.c | 10 +++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 9289abc..b9271e0 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1661,8 +1661,12 @@ D3DXVECTOR3* WINAPI D3DXVec3Unproject(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv, D3DXMATRIX m; D3DXVECTOR3 out; - D3DXMatrixMultiply(&m, pworld, pview); - D3DXMatrixMultiply(&m, &m, pprojection); + if (pworld) { + D3DXMatrixMultiply(&m, pworld, pview); + D3DXMatrixMultiply(&m, &m, pprojection); + } else { + D3DXMatrixMultiply(&m, pview, pprojection); + } D3DXMatrixInverse(&m, NULL, &m); out.x = 2.0f * ( pv->x - pviewport->X ) / pviewport->Width - 1.0f; out.y = 1.0f - 2.0f * ( pv->y - pviewport->Y ) / pviewport->Height; diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 83e2ef6..61f8567 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1197,9 +1197,9 @@ static void D3DXVector3Test(void) expect_vec3(expectedvec,gotvec); /*_______________D3DXVec3Length__________________________*/ - expected = 11.0f; - got = D3DXVec3Length(&u); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + expected = 11.0f; + got = D3DXVec3Length(&u); + ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); /* Tests the case NULL */ expected=0.0f; got = D3DXVec3Length(NULL); @@ -1299,6 +1299,10 @@ static void D3DXVector3Test(void) D3DXMatrixPerspectiveFovLH(&projection,D3DX_PI/4.0f,20.0f/17.0f,1.0f,1000.0f); D3DXVec3Unproject(&gotvec,&u,&viewport,&projection,&view,&world); expect_vec3(expectedvec,gotvec); + /* World matrix can be omitted */ + D3DXMatrixMultiply(&mat,&world,&view); + D3DXVec3Unproject(&gotvec,&u,&viewport,&projection,&mat,NULL); + expect_vec3(expectedvec,gotvec); } static void D3DXVector4Test(void)

1 0

Christian Costa : devenum: Reset moniker pointer before calling IFilterMapper2_RegisterFilter.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: a85957ae0ec324e09c232dabb0e830112a169d2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a85957ae0ec324e09c232dabb… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 12 19:52:30 2012 +0100 devenum: Reset moniker pointer before calling IFilterMapper2_RegisterFilter. --- dlls/devenum/createdevenum.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 5a20da5..615305d 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -670,8 +670,11 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) /* FIXME: do additional stuff with IMoniker here, depending on what RegisterFilter does */ - if (pMoniker) - IMoniker_Release(pMoniker); + if (pMoniker) + { + IMoniker_Release(pMoniker); + pMoniker = NULL; + } wsprintfW(szDSoundName, szDSoundNameFormat, wocaps.szPname); res = IFilterMapper2_RegisterFilter(pMapper,

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2012