October 2014 - Wine-commits

Sebastian Lackner : shlwapi: Fix swapped argument order in SHMapHandle.
by Alexandre Julliard 02 Oct '14

02 Oct '14

Module: wine Branch: master Commit: c95b182d159699447bfbff161613c5a4cbb7652a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c95b182d159699447bfbff161… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 2 14:43:33 2014 +0200 shlwapi: Fix swapped argument order in SHMapHandle. --- dlls/shlwapi/ordinal.c | 4 ++-- dlls/shlwapi/tests/ordinal.c | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index e5da1cf..756ed34 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -265,8 +265,8 @@ BOOL WINAPI SHFreeShared(HANDLE hShared, DWORD dwProcId) * * PARAMS * hShared [I] Shared memory handle to duplicate - * dwDstProcId [I] ID of the process wanting the duplicated handle * dwSrcProcId [I] ID of the process owning hShared + * dwDstProcId [I] ID of the process wanting the duplicated handle * dwAccess [I] Desired DuplicateHandle() access * dwOptions [I] Desired DuplicateHandle() options * @@ -275,7 +275,7 @@ BOOL WINAPI SHFreeShared(HANDLE hShared, DWORD dwProcId) * Failure: A NULL handle. * */ -HANDLE WINAPI SHMapHandle(HANDLE hShared, DWORD dwDstProcId, DWORD dwSrcProcId, +HANDLE WINAPI SHMapHandle(HANDLE hShared, DWORD dwSrcProcId, DWORD dwDstProcId, DWORD dwAccess, DWORD dwOptions) { HANDLE hRet; diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 7c7c4a0..099907b 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -548,28 +548,24 @@ static void test_alloc_shared_remote(DWORD procid, HANDLE hmem) /* It seems like Windows Vista/2008 uses a different internal implementation * for shared memory, and calling SHMapHandle fails with ERROR_INVALID_HANDLE. */ - todo_wine ok(hmem2 != NULL || broken(hmem2 == NULL && GetLastError() == ERROR_INVALID_HANDLE), "SHMapHandle failed: %u\n", GetLastError()); if (hmem2 == NULL && GetLastError() == ERROR_INVALID_HANDLE) { - skip("Subprocess failed to map shared memory, skipping test\n"); + win_skip("Subprocess failed to map shared memory, skipping test\n"); return; } p = pSHLockShared(hmem2, GetCurrentProcessId()); - todo_wine ok(p != NULL, "SHLockShared failed: %u\n", GetLastError()); if (p != NULL) ok(p->value == 0x12345679, "Wrong value in shared memory: %d instead of %d\n", p->value, 0x12345679); ret = pSHUnlockShared(p); - todo_wine ok(ret, "SHUnlockShared failed: %u\n", GetLastError()); ret = pSHFreeShared(hmem2, GetCurrentProcessId()); - todo_wine ok(ret, "SHFreeShared failed: %u\n", GetLastError()); }

1 0

Sebastian Lackner : shlwapi: Remove unnecessary internal function SHLWAPI_DupSharedHandle.
by Alexandre Julliard 02 Oct '14

02 Oct '14

Module: wine Branch: master Commit: 403ff3734ac9e9d0dcdcfc8cc63c1e6a308811a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=403ff3734ac9e9d0dcdcfc8cc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 2 14:46:39 2014 +0200 shlwapi: Remove unnecessary internal function SHLWAPI_DupSharedHandle. --- dlls/shlwapi/ordinal.c | 61 ++++++++++++++++++-------------------------------- 1 file changed, 22 insertions(+), 39 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 756ed34..21a75e9 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -74,13 +74,24 @@ BOOL WINAPI SHAboutInfoW(LPWSTR,DWORD); */ /************************************************************************* - * SHLWAPI_DupSharedHandle + * @ [SHLWAPI.11] + * + * Copy a sharable memory handle from one process to another. + * + * PARAMS + * hShared [I] Shared memory handle to duplicate + * dwSrcProcId [I] ID of the process owning hShared + * dwDstProcId [I] ID of the process wanting the duplicated handle + * dwAccess [I] Desired DuplicateHandle() access + * dwOptions [I] Desired DuplicateHandle() options + * + * RETURNS + * Success: A handle suitable for use by the dwDstProcId process. + * Failure: A NULL handle. * - * Internal implementation of SHLWAPI_11. */ -static HANDLE SHLWAPI_DupSharedHandle(HANDLE hShared, DWORD dwDstProcId, - DWORD dwSrcProcId, DWORD dwAccess, - DWORD dwOptions) +HANDLE WINAPI SHMapHandle(HANDLE hShared, DWORD dwSrcProcId, DWORD dwDstProcId, + DWORD dwAccess, DWORD dwOptions) { HANDLE hDst, hSrc; DWORD dwMyProcId = GetCurrentProcessId(); @@ -170,9 +181,8 @@ HANDLE WINAPI SHAllocShared(LPCVOID lpvData, DWORD dwSize, DWORD dwProcId) /* Release view. All further views mapped will be opaque */ UnmapViewOfFile(pMapped); - hRet = SHLWAPI_DupSharedHandle(hMap, dwProcId, - GetCurrentProcessId(), FILE_MAP_ALL_ACCESS, - DUPLICATE_SAME_ACCESS); + hRet = SHMapHandle(hMap, GetCurrentProcessId(), dwProcId, + FILE_MAP_ALL_ACCESS, DUPLICATE_SAME_ACCESS); } CloseHandle(hMap); @@ -201,8 +211,8 @@ PVOID WINAPI SHLockShared(HANDLE hShared, DWORD dwProcId) TRACE("(%p %d)\n", hShared, dwProcId); /* Get handle to shared memory for current process */ - hDup = SHLWAPI_DupSharedHandle(hShared, GetCurrentProcessId(), dwProcId, - FILE_MAP_ALL_ACCESS, 0); + hDup = SHMapHandle(hShared, dwProcId, GetCurrentProcessId(), FILE_MAP_ALL_ACCESS, 0); + /* Get View */ pMapped = MapViewOfFile(hDup, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 0); CloseHandle(hDup); @@ -252,40 +262,13 @@ BOOL WINAPI SHFreeShared(HANDLE hShared, DWORD dwProcId) TRACE("(%p %d)\n", hShared, dwProcId); /* Get a copy of the handle for our process, closing the source handle */ - hClose = SHLWAPI_DupSharedHandle(hShared, GetCurrentProcessId(), dwProcId, - FILE_MAP_ALL_ACCESS,DUPLICATE_CLOSE_SOURCE); + hClose = SHMapHandle(hShared, dwProcId, GetCurrentProcessId(), + FILE_MAP_ALL_ACCESS,DUPLICATE_CLOSE_SOURCE); /* Close local copy */ return CloseHandle(hClose); } /************************************************************************* - * @ [SHLWAPI.11] - * - * Copy a sharable memory handle from one process to another. - * - * PARAMS - * hShared [I] Shared memory handle to duplicate - * dwSrcProcId [I] ID of the process owning hShared - * dwDstProcId [I] ID of the process wanting the duplicated handle - * dwAccess [I] Desired DuplicateHandle() access - * dwOptions [I] Desired DuplicateHandle() options - * - * RETURNS - * Success: A handle suitable for use by the dwDstProcId process. - * Failure: A NULL handle. - * - */ -HANDLE WINAPI SHMapHandle(HANDLE hShared, DWORD dwSrcProcId, DWORD dwDstProcId, - DWORD dwAccess, DWORD dwOptions) -{ - HANDLE hRet; - - hRet = SHLWAPI_DupSharedHandle(hShared, dwDstProcId, dwSrcProcId, - dwAccess, dwOptions); - return hRet; -} - -/************************************************************************* * @ [SHLWAPI.13] * * Create and register a clipboard enumerator for a web browser.

1 0

Qian Hong : jscript: Ignore BOM mark in next_token.
by Alexandre Julliard 02 Oct '14

02 Oct '14

Module: wine Branch: master Commit: 66ba778cadcc092b390cd867ac05c7b55c1f7968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66ba778cadcc092b390cd867a… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Oct 2 14:09:10 2014 +0800 jscript: Ignore BOM mark in next_token. --- dlls/jscript/lex.c | 2 +- dlls/jscript/tests/run.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index b4a3700..af4b24b 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -241,7 +241,7 @@ static BOOL skip_comment(parser_ctx_t *ctx) static BOOL skip_spaces(parser_ctx_t *ctx) { - while(ctx->ptr < ctx->end && isspaceW(*ctx->ptr)) { + while(ctx->ptr < ctx->end && (isspaceW(*ctx->ptr) || *ctx->ptr == 0xFEFF /* UTF16 BOM */)) { if(is_endline(*ctx->ptr++)) ctx->nl = TRUE; } diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index aa1783e..452f810 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -144,6 +144,7 @@ DEFINE_EXPECT(DeleteMemberByDispID_false); #define DISPID_TESTOBJ_ONLYDISPID 0x2001 #define DISPID_TESTOBJ_WITHPROP 0x2002 +#define JS_E_OUT_OF_MEMORY 0x800a03ec #define JS_E_INVALID_CHAR 0x800a03f6 static const WCHAR testW[] = {'t','e','s','t',0}; @@ -1966,6 +1967,56 @@ static void test_script_exprs(void) testing_expr = FALSE; } +struct bom_test +{ + WCHAR str[1024]; + HRESULT hres; +}; + +static void run_bom_tests(void) +{ + BSTR src; + int i; + HRESULT hres; + struct bom_test bom_tests[] = { + {{'v','a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',')',';','\0'}, S_OK}, + {{0xFEFF,'v','a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',')',';','\0'}, S_OK}, + {{'v',0xFEFF,'a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',')',';','\0'}, JS_E_OUT_OF_MEMORY}, + {{'v','a','r',0xFEFF,' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',')',';','\0'}, S_OK}, + {{'v','a','r',' ','a',' ','=',' ','1',';',' ',0xFEFF,'r','e','p','o','r','t','S','u','c','c','e','s','s','(',')',';','\0'}, S_OK}, + {{'v','a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t',0xFEFF,'S','u','c','c','e','s','s','(',')',';','\0'}, JS_E_OUT_OF_MEMORY}, + {{'v','a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s',0xFEFF,'(',')',';','\0'}, S_OK}, + {{'v','a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',0xFEFF,')',';','\0'}, S_OK}, + {{'v','a','r',' ','a',' ','=',0xFEFF,' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',0xFEFF,')',';','\0'}, S_OK}, + {{0xFEFF,'v','a','r',' ','a',' ','=',0xFEFF,0xFEFF,' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',0xFEFF,')',';','\0'}, S_OK}, + {{0}} + }; + + engine_clsid = &CLSID_JScript; + + for (i = 0; bom_tests[i].str[0]; i++) + { + if(bom_tests[i].hres == S_OK) + { + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + src = SysAllocString(bom_tests[i].str); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, src); + ok(hres == S_OK, "test %s failed with %08x\n", wine_dbgstr_w(src), hres); + SysFreeString(src); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + } + else + { + src = SysAllocString(bom_tests[i].str); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, src); + todo_wine ok(hres == bom_tests[i].hres, "test %s returned with %08x\n", wine_dbgstr_w(src), hres); + SysFreeString(src); + } + } +} + static BOOL run_tests(void) { HRESULT hres; @@ -2259,6 +2310,8 @@ static BOOL run_tests(void) "Object expected", NULL); + run_bom_tests(); + return TRUE; }

1 0

André Hentschel : Fix typo in WWN 376
by Jeremy Newman 02 Oct '14

02 Oct '14

Module: website Branch: master Commit: bf6418c402ead5fd3b9fe425545eecdc27577758 URL: http://source.winehq.org/git/website.git/?a=commit;h=bf6418c402ead5fd3b9fe4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 2 00:25:19 2014 +0200 Fix typo in WWN 376 --- wwn/en/wn20140930_376.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wwn/en/wn20140930_376.xml b/wwn/en/wn20140930_376.xml index 9dccc7f..20b123f 100644 --- a/wwn/en/wn20140930_376.xml +++ b/wwn/en/wn20140930_376.xml @@ -28,7 +28,7 @@ Its main goal is to inform you of what's going on around Wine. Wine is an open s posts="0" > -As you might have seen in <a href="//www.winehq.org/wwn/375">WWN 375</a>, Kai Tietz and I are working on MinGW-w64 targeting ARMv7. +As you might have seen in <a href="//www.winehq.org/wwn/369">WWN 369</a>, Kai Tietz and I are working on MinGW-w64 targeting ARMv7. Meanwhile I finished porting the CRT, but after a hackathon last week, we found out that we ran into a chicken-egg situation. @@ -49,7 +49,7 @@ After that the work on libgcc can begin and then we need to get a lot of things > Jacek Caban, who maintains the wine-gecko code, wrote to <a href="//www.winehq.org/pipermail/wine-devel/2014-September/105276.html">wine-devel</a> about an upcoming -wine-gecko version and why it took so long after the last release. +wine-gecko version and why it took so long after the last release. Happy testing! </section>

1 0

Joris van der Wel : server: A new function "set_sd_defaults_from_token".
by Alexandre Julliard 01 Oct '14

01 Oct '14

Module: wine Branch: master Commit: 6d19aa83bf2f302f7a658f48cb326e167b48c645 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d19aa83bf2f302f7a658f48c… Author: Joris van der Wel <joris(a)jorisvanderwel.com> Date: Wed Sep 17 15:35:26 2014 +0200 server: A new function "set_sd_defaults_from_token". --- server/object.c | 25 ++++++++++++++++--------- server/object.h | 2 ++ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/server/object.c b/server/object.c index 11ef0ce..ec196c1 100644 --- a/server/object.c +++ b/server/object.c @@ -423,12 +423,12 @@ struct security_descriptor *default_get_sd( struct object *obj ) return obj->sd; } -int default_set_sd( struct object *obj, const struct security_descriptor *sd, - unsigned int set_info ) +int set_sd_defaults_from_token( struct object *obj, const struct security_descriptor *sd, + unsigned int set_info, struct token *token ) { struct security_descriptor new_sd, *new_sd_ptr; int present; - const SID *owner, *group; + const SID *owner = NULL, *group = NULL; const ACL *sacl, *dacl; char *ptr; @@ -446,9 +446,9 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, owner = sd_get_owner( obj->sd ); new_sd.owner_len = obj->sd->owner_len; } - else + else if (token) { - owner = token_get_user( current->process->token ); + owner = token_get_user( token ); new_sd.owner_len = security_sid_len( owner ); } @@ -462,9 +462,9 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, group = sd_get_group( obj->sd ); new_sd.group_len = obj->sd->group_len; } - else + else if (token) { - group = token_get_primary_group( current->process->token ); + group = token_get_primary_group( token ); new_sd.group_len = security_sid_len( group ); } @@ -494,9 +494,9 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, if (obj->sd && present) new_sd.dacl_len = obj->sd->dacl_len; - else + else if (token) { - dacl = token_get_default_dacl( current->process->token ); + dacl = token_get_default_dacl( token ); new_sd.dacl_len = dacl->AclSize; } } @@ -521,6 +521,13 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, return 1; } +/** Set the security descriptor using the current primary token for defaults. */ +int default_set_sd( struct object *obj, const struct security_descriptor *sd, + unsigned int set_info ) +{ + return set_sd_defaults_from_token( obj, sd, set_info, current->process->token ); +} + struct object *no_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) { diff --git a/server/object.h b/server/object.h index bb3ff21..dd93b76e 100644 --- a/server/object.h +++ b/server/object.h @@ -139,6 +139,8 @@ extern struct fd *no_get_fd( struct object *obj ); extern unsigned int no_map_access( struct object *obj, unsigned int access ); extern struct security_descriptor *default_get_sd( struct object *obj ); extern int default_set_sd( struct object *obj, const struct security_descriptor *sd, unsigned int set_info ); +extern int set_sd_defaults_from_token( struct object *obj, const struct security_descriptor *sd, + unsigned int set_info, struct token *token ); extern struct object *no_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attributes ); extern struct object *no_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options );

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 01 Oct '14

01 Oct '14

Module: wine Branch: master Commit: 9e312d34f13fb8e7da220824f384c54aaac34b5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e312d34f13fb8e7da220824f… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Oct 1 17:22:21 2014 +0300 po: Update Finnish translation. --- po/fi.po | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/po/fi.po b/po/fi.po index 01c6443..88fd213 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3534,16 +3534,12 @@ msgid "Expected ')'" msgstr "Odotettiin merkkiä ')'" #: jscript.rc:40 -#, fuzzy -#| msgid "Subject Key Identifier" msgid "Expected identifier" -msgstr "Haltijan avaimen tunniste" +msgstr "Odotettiin tunnistetta" #: jscript.rc:41 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '='" -msgstr "Odotettiin merkkiä ';'" +msgstr "Odotettiin merkkiä '='" #: jscript.rc:42 msgid "Invalid character" @@ -3574,20 +3570,16 @@ msgid "Label not found" msgstr "Nimiötä ei löydy" #: jscript.rc:49 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@end'" -msgstr "Odotettiin merkkiä ';'" +msgstr "Odotettiin sanaa '@end'" #: jscript.rc:50 msgid "Conditional compilation is turned off" msgstr "Ehdollinen kääntäminen on pois käytöstä" #: jscript.rc:51 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@'" -msgstr "Odotettiin merkkiä ';'" +msgstr "Odotettiin merkkiä '@'" #: jscript.rc:54 msgid "Number expected"

1 0

Nikolay Sivov : usp10: Remove comment that's no longer true.
by Alexandre Julliard 01 Oct '14

01 Oct '14

Module: wine Branch: master Commit: 5281bff120fa377703948945201dc63bb97392b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5281bff120fa3777039489452… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 1 18:34:44 2014 +0400 usp10: Remove comment that's no longer true. --- dlls/usp10/usp10.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 8769bd9..6aa6b3e 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3407,10 +3407,6 @@ HRESULT WINAPI ScriptGetGlyphABCWidth(HDC hdc, SCRIPT_CACHE *psc, WORD glyph, AB * Success: S_OK * Failure: Non-zero HRESULT value. * - * BUGS - * This stub works correctly for any sequence of a single - * embedding level but not for sequences of different - * embedding levels, i.e. mixtures of RTL and LTR scripts. */ HRESULT WINAPI ScriptLayout(int runs, const BYTE *level, int *vistolog, int *logtovis) {

1 0

Alexandre Julliard : kernel32/tests: Fix overlapped status checks for 64-bit.
by Alexandre Julliard 01 Oct '14

01 Oct '14

Module: wine Branch: master Commit: 5afbb6ba9e958ca21d03093165a85884827fe748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5afbb6ba9e958ca21d0309316… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 1 21:14:24 2014 +0200 kernel32/tests: Fix overlapped status checks for 64-bit. --- dlls/kernel32/tests/change.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index 9226950..ad22f18 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -472,7 +472,7 @@ static void test_readdirectorychanges(void) r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "event should be ready\n" ); - ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); ok( ov.InternalHigh == 0x12, "ov.InternalHigh wrong\n"); pfni = (PFILE_NOTIFY_INFORMATION) buffer; @@ -502,7 +502,7 @@ static void test_readdirectorychanges(void) r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); ok(r==TRUE, "should return true\n"); - ok( ov.Internal == STATUS_PENDING, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_PENDING, "ov.Internal wrong\n"); ok( ov.InternalHigh == 1, "ov.InternalHigh wrong\n"); r = WaitForSingleObject( ov.hEvent, 0 ); @@ -514,10 +514,10 @@ static void test_readdirectorychanges(void) r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "should be ready\n" ); - ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); ok( ov.InternalHigh == 0x12, "ov.InternalHigh wrong\n"); - if (ov.Internal == STATUS_SUCCESS) + if ((NTSTATUS)ov.Internal == STATUS_SUCCESS) { r = GetOverlappedResult( hdir, &ov, &dwCount, TRUE ); ok( r == TRUE, "getoverlappedresult failed\n"); @@ -540,7 +540,7 @@ static void test_readdirectorychanges(void) r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "should be ready\n" ); - ok( ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n"); ok( ov.InternalHigh == 0, "ov.InternalHigh wrong\n"); /* test the recursive watch */ @@ -553,7 +553,7 @@ static void test_readdirectorychanges(void) r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "should be ready\n" ); - ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); ok( ov.InternalHigh == 0x18, "ov.InternalHigh wrong\n"); pfni = (PFILE_NOTIFY_INFORMATION) buffer; @@ -589,7 +589,7 @@ static void test_readdirectorychanges(void) ok( pfni->FileNameLength == 6*sizeof(WCHAR), "len wrong %u\n", pfni->FileNameLength ); ok( !memcmp(pfni->FileName,&szGa[1],6*sizeof(WCHAR)), "name wrong\n" ); - ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); dwCount = (char *)&pfni->FileName[pfni->FileNameLength/sizeof(WCHAR)] - buffer; ok( ov.InternalHigh == dwCount, "ov.InternalHigh wrong %lu/%u\n",ov.InternalHigh, dwCount ); @@ -666,7 +666,7 @@ static void test_readdirectorychanges_null(void) r = WaitForSingleObject( ov.hEvent, 0 ); ok( r == WAIT_OBJECT_0, "event should be ready\n" ); - ok( ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n"); ok( ov.InternalHigh == 0, "ov.InternalHigh wrong\n"); ov.Internal = 0; @@ -687,7 +687,7 @@ static void test_readdirectorychanges_null(void) r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "should be ready\n" ); - ok( ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n"); ok( ov.InternalHigh == 0, "ov.InternalHigh wrong\n"); pfni = (PFILE_NOTIFY_INFORMATION) buffer; @@ -763,7 +763,7 @@ static void test_readdirectorychanges_filedir(void) r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "event should be ready\n" ); - ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); ok( ov.InternalHigh == 0x12, "ov.InternalHigh wrong\n"); pfni = (PFILE_NOTIFY_INFORMATION) buffer;

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 01 Oct '14

01 Oct '14

Module: wine Branch: master Commit: fcf4f1c697f775679b09ef19d69c575fa98d7b55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcf4f1c697f775679b09ef19d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 1 07:47:09 2014 +0400 po: Update Russian translation. --- po/ru.po | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/po/ru.po b/po/ru.po index 818c087..2edc019 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3546,16 +3546,12 @@ msgid "Expected ')'" msgstr "Ожидается «)»" #: jscript.rc:40 -#, fuzzy -#| msgid "Subject Key Identifier" msgid "Expected identifier" -msgstr "Идентификатор ключа субъекта" +msgstr "Ожидается идентификатор" #: jscript.rc:41 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '='" -msgstr "Ожидается «;»" +msgstr "Ожидается «=»" #: jscript.rc:42 msgid "Invalid character" @@ -3586,20 +3582,16 @@ msgid "Label not found" msgstr "Метка не найдена" #: jscript.rc:49 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@end'" -msgstr "Ожидается «;»" +msgstr "Ожидается «@end»" #: jscript.rc:50 msgid "Conditional compilation is turned off" msgstr "Условная компиляция отключена" #: jscript.rc:51 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@'" -msgstr "Ожидается «;»" +msgstr "Ожидается «@»" #: jscript.rc:54 msgid "Number expected"

1 0

Henri Verbeet : wined3d: Get rid of the WINED3D_CT_NONE case in d3dfmt_convert_surface().
by Alexandre Julliard 01 Oct '14

01 Oct '14

Module: wine Branch: master Commit: c5d917777a564219d455224f6234dcaae8b4df1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5d917777a564219d455224f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 1 09:18:55 2014 +0200 wined3d: Get rid of the WINED3D_CT_NONE case in d3dfmt_convert_surface(). This is never used. --- dlls/wined3d/surface.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index acf3f46..272b5de 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3168,12 +3168,6 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI switch (conversion_type) { - case WINED3D_CT_NONE: - { - memcpy(dst, src, pitch * height); - break; - } - case WINED3D_CT_P8: if (surface->container->swapchain && surface->container->swapchain->palette) {

1 0