August 2013 - Wine-Commits - list.winehq.org

Bruno Jesus : ws2_32/tests: Test the precedence of parameters while creating a socket in WSASocket().
by Alexandre Julliard Aug. 1, 2013

Aug. 1, 2013

Module: wine Branch: master Commit: d5f7f74f7868667f4257ea251fee74569b162594 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5f7f74f7868667f4257ea251… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jul 31 18:32:43 2013 -0300 ws2_32/tests: Test the precedence of parameters while creating a socket in WSASocket(). --- dlls/ws2_32/tests/sock.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2ee81ae..7e70449 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1733,7 +1733,21 @@ todo_wine FROM_PROTOCOL_INFO, &pi[0], 0, 0); ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", WSAGetLastError()); + closesocket(sock); + /* find what parameters are used first: plain parameters or protocol info struct */ + pi[0].iProtocol = IPPROTO_UDP; + pi[0].iSocketType = SOCK_DGRAM; + pi[0].iAddressFamily = AF_INET; + sock = WSASocketA(AF_INET, SOCK_STREAM, IPPROTO_TCP, &pi[0], 0, 0); + ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err,"getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == SOCK_STREAM, "Wrong socket type, expected %d received %d\n", + SOCK_STREAM, socktype); closesocket(sock); HeapFree(GetProcessHeap(), 0, pi);

1 0

Bruno Jesus : ws2_32/tests: Fix bad usage of WSAGetLastError() in tests.
by Alexandre Julliard Aug. 1, 2013

Aug. 1, 2013

Module: wine Branch: master Commit: d7f216818f10077599dc17a5e2a43ca0f7d520a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7f216818f10077599dc17a5e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jul 31 18:32:26 2013 -0300 ws2_32/tests: Fix bad usage of WSAGetLastError() in tests. --- dlls/ws2_32/tests/sock.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 1a75ffd..2ee81ae 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1766,8 +1766,8 @@ todo_wine todo_wine { size = sizeof(socktype); socktype = 0xdead; - ok(!getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size), "getsockopt failed with %d\n", - WSAGetLastError()); + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); ok(socktype == pi[0].iSocketType, "Wrong socket type, expected %d received %d\n", pi[0].iSocketType, socktype); } @@ -1783,9 +1783,9 @@ todo_wine size = sizeof(socktype); socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); todo_wine - ok(!getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size), "getsockopt failed with %d\n", - WSAGetLastError()); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); for (j = 0; j < items; j++) { @@ -2508,14 +2508,16 @@ static void test_listen(void) ok (ret == WSAEINVAL, "expected 10022, received %d\n", ret); acceptc = 0xdead; - ok (!getsockopt(fdA, SOL_SOCKET, SO_ACCEPTCONN, (char*)&acceptc, &olen), "getsockopt failed\n"); + ret = getsockopt(fdA, SOL_SOCKET, SO_ACCEPTCONN, (char*)&acceptc, &olen); + ok (!ret, "getsockopt failed\n"); ok (acceptc == 0, "SO_ACCEPTCONN should be 0, received %d\n", acceptc); ok (!listen(fdA, 0), "listen failed\n"); ok (!listen(fdA, SOMAXCONN), "double listen failed\n"); acceptc = 0xdead; - ok (!getsockopt(fdA, SOL_SOCKET, SO_ACCEPTCONN, (char*)&acceptc, &olen), "getsockopt failed\n"); + ret = getsockopt(fdA, SOL_SOCKET, SO_ACCEPTCONN, (char*)&acceptc, &olen); + ok (!ret, "getsockopt failed\n"); ok (acceptc == 1, "SO_ACCEPTCONN should be 1, received %d\n", acceptc); SetLastError(0xdeadbeef);

1 0

Volkan Gezer : po: Updated Turkish translations.
by Alexandre Julliard Aug. 1, 2013

Aug. 1, 2013

Module: wine Branch: master Commit: 5b17363adda159fab9e4726ea604fc32639bb564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b17363adda159fab9e4726ea… Author: Volkan Gezer <volkangezer(a)gmail.com> Date: Wed Jul 31 22:10:09 2013 +0200 po: Updated Turkish translations. --- po/tr.po | 36 +++++++++++++++--------------------- 1 files changed, 15 insertions(+), 21 deletions(-) diff --git a/po/tr.po b/po/tr.po index c9e55f0..f0e624b 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4420,7 +4420,7 @@ msgstr "Takas hatası.\n" #: winerror.mc:1021 msgid "Stack overflow.\n" -msgstr "" +msgstr "Yığın bellek taştı.\n" #: winerror.mc:1026 msgid "Invalid message.\n" @@ -4428,7 +4428,7 @@ msgstr "Geçersiz mesaj.\n" #: winerror.mc:1031 msgid "Cannot complete.\n" -msgstr "" +msgstr "Tamamlanamadı.\n" #: winerror.mc:1036 msgid "Invalid flags.\n" @@ -4456,7 +4456,7 @@ msgstr "Kayıt defteri bozuk.\n" #: winerror.mc:1066 msgid "Invalid key.\n" -msgstr "" +msgstr "Geçersiz anahtar.\n" #: winerror.mc:1071 msgid "Can't open registry key.\n" @@ -4476,23 +4476,23 @@ msgstr "Kayıt kurtarıldı.\n" #: winerror.mc:1091 msgid "Registry is corrupt.\n" -msgstr "" +msgstr "Kayıt defteri bozuk.\n" #: winerror.mc:1096 msgid "I/O to registry failed.\n" -msgstr "" +msgstr "Kayda G/Ç başarısız.\n" #: winerror.mc:1101 msgid "Not registry file.\n" -msgstr "" +msgstr "Kayıt dosyası değil.\n" #: winerror.mc:1106 msgid "Key deleted.\n" -msgstr "" +msgstr "Anahtar silindi.\n" #: winerror.mc:1111 msgid "No registry log space.\n" -msgstr "" +msgstr "Kayıt günlük boşluğu yok.\n" #: winerror.mc:1116 msgid "Registry key has subkeys.\n" @@ -4552,7 +4552,7 @@ msgstr "" #: winerror.mc:1186 msgid "Service not active.\n" -msgstr "" +msgstr "Hizmet etkin değil.\n" #: winerror.mc:1191 msgid "Service controller connect failed.\n" @@ -5844,15 +5844,15 @@ msgstr "Aygıt kaldırıldı.\n" #: winerror.mc:2811 msgid "Installation already running.\n" -msgstr "" +msgstr "Kurulum zaten çalışıyor.\n" #: winerror.mc:2816 msgid "Installation package failed to open.\n" -msgstr "" +msgstr "Kurulum paketi açılamadı.\n" #: winerror.mc:2821 msgid "Installation package is invalid.\n" -msgstr "" +msgstr "Kurulum paketi geçersiz.\n" #: winerror.mc:2826 msgid "Installer user interface failed.\n" @@ -13564,22 +13564,16 @@ msgid "Not yet implemented" msgstr "Henüz tamamlanmadı" #: winefile.rc:106 -#, fuzzy -#| msgid "Expiration Date" msgid "Creation date" -msgstr "Son Kullanma Tarihi" +msgstr "Oluşturma tarihi" #: winefile.rc:107 -#, fuzzy -#| msgid "Access denied.\n" msgid "Access date" -msgstr "Erişim engellendi.\n" +msgstr "Erişim tarihi" #: winefile.rc:108 -#, fuzzy -#| msgid "Certification Path" msgid "Modification date" -msgstr "Sertifika Yolu" +msgstr "Düzenlenme tarihi" #: winefile.rc:109 msgid "Index/Inode"

1 0

Alexandre Julliard : wbemprox: Use bison directives instead of defines to specify extra lexer parameters.
by Alexandre Julliard Aug. 1, 2013

Aug. 1, 2013

Module: wine Branch: master Commit: c14e322a92a24e704836c5c12207c694a30e805f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c14e322a92a24e704836c5c12… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 1 12:00:44 2013 +0200 wbemprox: Use bison directives instead of defines to specify extra lexer parameters. --- dlls/wbemprox/wql.y | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index 8e347c2..58663d0 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -30,11 +30,6 @@ #include "wine/debug.h" #include "wine/unicode.h" -#define YYLEX_PARAM ctx -#define YYPARSE_PARAM ctx -#define YYERROR_DEBUG 1 -#define YYERROR_VERBOSE 1 - WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); struct parser @@ -181,7 +176,7 @@ static struct expr *expr_propval( struct parser *parser, const struct property * return e; } -static int wql_error( const char *str ); +static int wql_error( struct parser *parser, const char *str ); static int wql_lex( void *val, struct parser *parser ); #define PARSER_BUBBLE_UP_VIEW( parser, result, current_view ) \ @@ -190,6 +185,9 @@ static int wql_lex( void *val, struct parser *parser ); %} +%lex-param { struct parser *ctx } +%parse-param { struct parser *ctx } +%error-verbose %pure-parser %union @@ -691,7 +689,7 @@ static int wql_lex( void *p, struct parser *parser ) return token; } -static int wql_error( const char *str ) +static int wql_error( struct parser *parser, const char *str ) { ERR("%s\n", str); return 0;

1 0

Nikolay Sivov : oledb32: Implement IRowPosition::Initialize().
by Alexandre Julliard Aug. 1, 2013

Aug. 1, 2013

Module: wine Branch: master Commit: 0e2e8386978df1a1dfe4e1336b59924e102a251f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e2e8386978df1a1dfe4e1336… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 1 07:53:48 2013 +0400 oledb32: Implement IRowPosition::Initialize(). --- dlls/oledb32/rowpos.c | 15 +++++++++++++-- include/oledberr.h | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/rowpos.c b/dlls/oledb32/rowpos.c index c7581b7..d789c19 100644 --- a/dlls/oledb32/rowpos.c +++ b/dlls/oledb32/rowpos.c @@ -23,6 +23,7 @@ #include "ole2.h" #include "oledb.h" +#include "oledberr.h" #include "oledb_private.h" #include "wine/debug.h" @@ -33,6 +34,8 @@ typedef struct { IRowPosition IRowPosition_iface; LONG ref; + + IRowset *rowset; } rowpos; static inline rowpos *impl_from_IRowPosition(IRowPosition *iface) @@ -79,7 +82,10 @@ static ULONG WINAPI rowpos_Release(IRowPosition* iface) TRACE("(%p)->(%d)\n", This, ref); if (ref == 0) + { + if (This->rowset) IRowset_Release(This->rowset); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -109,8 +115,12 @@ static HRESULT WINAPI rowpos_GetRowset(IRowPosition *iface, REFIID riid, IUnknow static HRESULT WINAPI rowpos_Initialize(IRowPosition *iface, IUnknown *rowset) { rowpos *This = impl_from_IRowPosition(iface); - FIXME("(%p)->(%p): stub\n", This, rowset); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, rowset); + + if (This->rowset) return DB_E_ALREADYINITIALIZED; + + return IUnknown_QueryInterface(rowset, &IID_IRowset, (void**)&This->rowset); } static HRESULT WINAPI rowpos_SetRowPosition(IRowPosition *iface, HCHAPTER chapter, @@ -148,6 +158,7 @@ HRESULT create_oledb_rowpos(IUnknown *outer, void **obj) This->IRowPosition_iface.lpVtbl = &rowpos_vtbl; This->ref = 1; + This->rowset = NULL; *obj = &This->IRowPosition_iface; diff --git a/include/oledberr.h b/include/oledberr.h index 9b87ba7..d1306e4 100644 --- a/include/oledberr.h +++ b/include/oledberr.h @@ -42,6 +42,7 @@ #define DB_E_BADPROPERTYVALUE 0x80040e44 #define DB_E_INVALID 0x80040e45 +#define DB_E_ALREADYINITIALIZED 0x80040e52 #define DB_E_DATAOVERFLOW 0x80040e57 #define DB_E_MISMATCHEDPROVIDER 0x80040e75

1 0

Alexandre Julliard : wrc: Remove non-bison compatibility code.
by Alexandre Julliard Aug. 1, 2013

Aug. 1, 2013

Module: wine Branch: master Commit: 8fcac3b2bb8ce4cdbcffc126df779bf1be168882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fcac3b2bb8ce4cdbcffc126d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 1 12:04:29 2013 +0200 wrc: Remove non-bison compatibility code. --- tools/wrc/parser.y | 27 +-------------------------- 1 files changed, 1 insertions(+), 26 deletions(-) diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index ad5fb98..ff59327 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -142,31 +142,6 @@ #include "wingdi.h" #include "winuser.h" -#if defined(YYBYACC) - /* Berkeley yacc (byacc) doesn't seem to know about these */ - /* Some *BSD supplied versions do define these though */ -# ifndef YYEMPTY -# define YYEMPTY (-1) /* Empty lookahead value of yychar */ -# endif -# ifndef YYLEX -# define YYLEX yylex() -# endif - -#elif defined(YYBISON) - /* Bison was used for original development */ - /* #define YYEMPTY -2 */ - /* #define YYLEX yylex() */ - -#else - /* No yacc we know yet */ -# if !defined(YYEMPTY) || !defined(YYLEX) -# error Yacc version/type unknown. This version needs to be verified for settings of YYEMPTY and YYLEX. -# elif defined(__GNUC__) /* gcc defines the #warning directive */ -# warning Yacc version/type unknown. It defines YYEMPTY and YYLEX, but is not tested - /* #else we just take a chance that it works... */ -# endif -#endif - int want_nl = 0; /* Signal flex that we need the next newline */ int want_id = 0; /* Signal flex that we need the next identifier */ static stringtable_t *tagstt; /* Stringtable tag. @@ -2837,7 +2812,7 @@ static int rsrcid_to_token(int lookahead) /* Get a token if we don't have one yet */ if(lookahead == YYEMPTY) - lookahead = YYLEX; + lookahead = yylex(); /* Only numbers are possibly interesting */ switch(lookahead)

1 0

Qian Hong : imm32: Fixed ImmUnlockIMC.
by Alexandre Julliard Aug. 1, 2013

Aug. 1, 2013

Module: wine Branch: master Commit: 44f60067381245ed11162d8796db0dbd96f8ec3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=44f60067381245ed11162d879… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Aug 1 14:32:35 2013 +0800 imm32: Fixed ImmUnlockIMC. --- dlls/imm32/imm.c | 5 +++-- dlls/imm32/tests/imm32.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 62f4b71..284d49e 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2606,8 +2606,9 @@ LPINPUTCONTEXT WINAPI ImmLockIMC(HIMC hIMC) BOOL WINAPI ImmUnlockIMC(HIMC hIMC) { InputContextData *data = hIMC; - data->dwLock--; - return (data->dwLock!=0); + if (data->dwLock) + data->dwLock--; + return TRUE; } /*********************************************************************** diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 7313854..0d4cb5c 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -702,13 +702,13 @@ static void test_ImmGetIMCLockCount(void) count = ImmGetIMCLockCount(imc); ok(count == 1, "expect 1, returned %d\n", count); ret = ImmUnlockIMC(imc); - todo_wine ok(ret == TRUE, "expect TRUE, ret %d\n", ret); + ok(ret == TRUE, "expect TRUE, ret %d\n", ret); count = ImmGetIMCLockCount(imc); ok(count == 0, "expect 0, returned %d\n", count); ret = ImmUnlockIMC(imc); ok(ret == TRUE, "expect TRUE, ret %d\n", ret); count = ImmGetIMCLockCount(imc); - todo_wine ok(count == 0, "expect 0, returned %d\n", count); + ok(count == 0, "expect 0, returned %d\n", count); ImmDestroyContext(imc); }

1 0

Qian Hong : imm32/tests: Added test for IMC lock count.
by Alexandre Julliard Aug. 1, 2013

Aug. 1, 2013

Module: wine Branch: master Commit: 0f14a77f5da795cc240716486a16bc92462d7274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f14a77f5da795cc240716486… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Aug 1 14:32:24 2013 +0800 imm32/tests: Added test for IMC lock count. --- dlls/imm32/tests/imm32.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 8e6dab8..7313854 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -24,6 +24,7 @@ #include "winuser.h" #include "wingdi.h" #include "imm.h" +#include "ddk/imm.h" #define NUMELEMS(array) (sizeof((array))/sizeof((array)[0])) @@ -687,6 +688,30 @@ static void test_ImmDefaultHwnd(void) DestroyWindow(hwnd); } +static void test_ImmGetIMCLockCount(void) +{ + HIMC imc; + DWORD count, ret; + INPUTCONTEXT *ic; + + imc = ImmCreateContext(); + count = ImmGetIMCLockCount(imc); + ok(count == 0, "expect 0, returned %d\n", count); + ic = ImmLockIMC(imc); + ok(ic != NULL, "ImmLockIMC failed\n!"); + count = ImmGetIMCLockCount(imc); + ok(count == 1, "expect 1, returned %d\n", count); + ret = ImmUnlockIMC(imc); + todo_wine ok(ret == TRUE, "expect TRUE, ret %d\n", ret); + count = ImmGetIMCLockCount(imc); + ok(count == 0, "expect 0, returned %d\n", count); + ret = ImmUnlockIMC(imc); + ok(ret == TRUE, "expect TRUE, ret %d\n", ret); + count = ImmGetIMCLockCount(imc); + todo_wine ok(count == 0, "expect 0, returned %d\n", count); + ImmDestroyContext(imc); +} + static void test_ImmMessages(void) { CANDIDATEFORM cf; @@ -846,6 +871,7 @@ START_TEST(imm32) { test_ImmGetContext(); test_ImmGetDescription(); test_ImmDefaultHwnd(); + test_ImmGetIMCLockCount(); msg_spy_cleanup(); /* Reinitialize the hooks to capture all windows */ msg_spy_init(NULL);

1 0

Alexandre Julliard : vbscript: Use bison directives instead of defines to specify extra lexer parameters.
by Alexandre Julliard Aug. 1, 2013

Aug. 1, 2013

Module: wine Branch: master Commit: f86c46f6403fe338a544ab134bdf563c5b0934ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=f86c46f6403fe338a544ab134… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 1 12:00:23 2013 +0200 vbscript: Use bison directives instead of defines to specify extra lexer parameters. --- dlls/vbscript/parser.y | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 4b380ef..3c54fd8 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -25,10 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); -#define YYLEX_PARAM ctx -#define YYPARSE_PARAM ctx - -static int parser_error(const char*); +static int parser_error(parser_ctx_t *,const char*); static void parse_complete(parser_ctx_t*,BOOL); @@ -82,7 +79,9 @@ static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; %} -%pure_parser +%lex-param { parser_ctx_t *ctx } +%parse-param { parser_ctx_t *ctx } +%pure-parser %start Program %union { @@ -426,7 +425,7 @@ Identifier | tPROPERTY { $$ = propertyW; } %% -static int parser_error(const char *str) +static int parser_error(parser_ctx_t *ctx, const char *str) { return 0; }

1 0

Marcus Meissner : mshtml: Fixed character vs byte mismatches.
by Alexandre Julliard Aug. 1, 2013

Aug. 1, 2013

Module: wine Branch: master Commit: c803d53b130b182bf42029b20aebb698d9c18643 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c803d53b130b182bf42029b20… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Aug 1 07:37:09 2013 +0200 mshtml: Fixed character vs byte mismatches. --- dlls/mshtml/tests/protocol.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 04c4714..b4a6fc7 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -281,7 +281,7 @@ static void test_res_url(const char *url_suffix) HRESULT hres; memcpy(url, res_url_base, res_url_base_len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, url_suffix, -1, url+res_url_base_len, sizeof(url)-res_url_base_len); + MultiByteToWideChar(CP_ACP, 0, url_suffix, -1, url+res_url_base_len, sizeof(url)/sizeof(WCHAR)-res_url_base_len); hres = CoCreateInstance(&CLSID_ResProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void**)&protocol); ok(hres == S_OK, "Could not create ResProtocol instance: %08x\n", hres); @@ -943,7 +943,7 @@ static void test_javascript_protocol(void) START_TEST(protocol) { - res_url_base_len = 6 + GetModuleFileNameW(NULL, res_url_base + 6 /* strlen("res://") */, sizeof(res_url_base)-6); + res_url_base_len = 6 + GetModuleFileNameW(NULL, res_url_base + 6 /* strlen("res://") */, sizeof(res_url_base)/sizeof(WCHAR)-6); OleInitialize(NULL);

1 0