March 2007 - Wine-commits - list.winehq.org

Paul Vriens : advapi32/tests: Add check to see if LookupAccountNameA is implemented.
by Alexandre Julliard 29 Mar '07

29 Mar '07

Module: wine Branch: master Commit: bb00c95c453b33527bf524ac54f86f5a3d66e351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb00c95c453b33527bf524ac5… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Mar 29 21:08:22 2007 +0200 advapi32/tests: Add check to see if LookupAccountNameA is implemented. --- dlls/advapi32/tests/security.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 43235a0..cdf8084 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1299,6 +1299,11 @@ static void test_LookupAccountName(void) sid_use = 0xcafebabe; SetLastError(0xdeadbeef); ret = LookupAccountNameA(NULL, user_name, NULL, &sid_size, NULL, &domain_size, &sid_use); + if(!ret && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) + { + skip("LookupAccountNameA is not implemented\n"); + return; + } ok(!ret, "Expected 0, got %d\n", ret); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError());

1 0

Fabian Bieler : wined3d: Implement support for projective textures in ps 2. 0 and later.
by Alexandre Julliard 29 Mar '07

29 Mar '07

Module: wine Branch: master Commit: 333de16fb6c7feff63914a50d9b8ce226836064a URL: http://source.winehq.org/git/wine.git/?a=commit;h=333de16fb6c7feff63914a50d… Author: Fabian Bieler <der.fabe(a)gmx.net> Date: Thu Mar 29 18:44:57 2007 +0200 wined3d: Implement support for projective textures in ps 2.0 and later. --- dlls/wined3d/baseshader.c | 3 +++ dlls/wined3d/glsl_shader.c | 9 +++++++-- dlls/wined3d/wined3d_private_types.h | 3 +++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 3446570..f4230d7 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -941,6 +941,9 @@ void shader_trace_init( default: TRACE("_(%u)", op); } + } else if (curOpcode->opcode == WINED3DSIO_TEX && + This->baseShader.hex_version >= WINED3DPS_VERSION(2,0)) { + if(opcode_token & WINED3DSI_TEXLD_PROJECT) TRACE("p"); } /* Destination token */ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2508eaa..707c325 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1472,8 +1472,13 @@ void pshader_glsl_tex(SHADER_OPCODE_ARG* arg) { } } else { sampler_idx = arg->src[1] & WINED3DSP_REGNUM_MASK; - /* TODO: Handle D3DSI_TEXLD_PROJECTED... */ - projected = FALSE; + if(arg->opcode_token & WINED3DSI_TEXLD_PROJECT) { + /* ps 2.0 texldp instruction always divides by the fourth component. */ + projected = TRUE; + mask = WINED3DSP_WRITEMASK_3; + } else { + projected = FALSE; + } } sampler_type = arg->reg_maps->samplers[sampler_idx] & WINED3DSP_TEXTURETYPE_MASK; diff --git a/dlls/wined3d/wined3d_private_types.h b/dlls/wined3d/wined3d_private_types.h index 01f5d26..3550910 100644 --- a/dlls/wined3d/wined3d_private_types.h +++ b/dlls/wined3d/wined3d_private_types.h @@ -291,6 +291,9 @@ typedef enum _WINED3DSHADER_INSTRUCTION_OPCODE_TYPE { #define WINED3DSHADER_INSTRUCTION_PREDICATED (1 << 28) +/* Undocumented opcode control to identify projective texture lookups in ps 2.0 and later */ +#define WINED3DSI_TEXLD_PROJECT 0x00010000 + /** Shader version tokens, and shader end tokens **/ #define WINED3DPS_VERSION(major, minor) (0xFFFF0000 | ((major) << 8) | (minor))

1 0

Clinton Stimpson : riched20: Fix text replacement with text limit.
by Alexandre Julliard 29 Mar '07

29 Mar '07

Module: wine Branch: master Commit: 4152c14df45819c0f2ea591d448293e61e7ab8c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4152c14df45819c0f2ea591d4… Author: Clinton Stimpson <cjstimpson(a)utwire.net> Date: Wed Mar 28 07:03:41 2007 -0600 riched20: Fix text replacement with text limit. --- dlls/riched20/caret.c | 12 +++++++----- dlls/riched20/tests/editor.c | 14 ++++++++++++++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index f6e0d7f..3f9547e 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -431,19 +431,21 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, { const WCHAR *pos; ME_Cursor *p = NULL; + int freeSpace; + + /* FIXME really HERE ? */ + if (ME_IsSelection(editor)) + ME_DeleteSelection(editor); + /* FIXME: is this too slow? */ /* Didn't affect performance for WM_SETTEXT (around 50sec/30K) */ - int freeSpace = editor->nTextLimit - ME_GetTextLength(editor); + freeSpace = editor->nTextLimit - ME_GetTextLength(editor); /* text operations set modified state */ editor->nModifyStep = 1; assert(style); - /* FIXME really HERE ? */ - if (ME_IsSelection(editor)) - ME_DeleteSelection(editor); - assert(nCursor>=0 && nCursor<editor->nCursors); if (len == -1) len = lstrlenW(str); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 71e82cb..4f95bfe 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1019,7 +1019,9 @@ static void test_EM_LIMITTEXT(void) static void test_EM_EXLIMITTEXT(void) { int i, selBegin, selEnd, len1, len2; + int result; char text[1024 + 1]; + char buffer[1024 + 1]; int textlimit = 0; /* multiple of 100 */ HWND hwndRichEdit = new_richedit(NULL); @@ -1087,6 +1089,18 @@ static void test_EM_EXLIMITTEXT(void) "EM_EXLIMITTEXT: No Change Expected\nOld Length: %d, New Length: %d, Limit: %d\n", len1,len2,i); + /* set text up to the limit, select all the text, then add a char */ + textlimit = 5; + memset(text, 'W', textlimit); + text[textlimit] = 0; + SendMessage(hwndRichEdit, EM_EXLIMITTEXT, 0, textlimit); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text); + SendMessage(hwndRichEdit, EM_SETSEL, 0, -1); + SendMessage(hwndRichEdit, WM_CHAR, 'A', 1); + SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + result = strcmp(buffer, "A"); + ok(0 == result, "got string = \"%s\"\n", buffer); + DestroyWindow(hwndRichEdit); }

1 0

Andrew Talbot : comctl32: Constify some variables.
by Alexandre Julliard 29 Mar '07

29 Mar '07

Module: wine Branch: master Commit: b07d7ce729ad6d3baca0879a822c7e7ccc16a521 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b07d7ce729ad6d3baca0879a8… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Mar 28 23:09:51 2007 +0100 comctl32: Constify some variables. --- dlls/comctl32/listview.c | 204 +++++++++++++++++++++++----------------------- 1 files changed, 103 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b07d7ce729ad6d3baca08…

1 0

Paul Vriens : advapi32/tests: Use skip.
by Alexandre Julliard 29 Mar '07

29 Mar '07

Module: wine Branch: master Commit: 640cb29bb76fdfca610fd1e338a3f10663bee669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=640cb29bb76fdfca610fd1e33… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Mar 29 20:47:02 2007 +0200 advapi32/tests: Use skip. --- dlls/advapi32/tests/security.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index ab7fc4b..9da55cb 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -873,7 +873,10 @@ static void test_token_attr(void) } if(!pConvertSidToStringSidA) + { + skip("ConvertSidToStringSidA is not available\n"); return; + } ret = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY|TOKEN_DUPLICATE, &Token); GLE = GetLastError();

1 0

Paul Vriens : advapi32/tests: Move check for ERROR_CALL_NOT_IMPLEMENTED to the first call.
by Alexandre Julliard 29 Mar '07

29 Mar '07

Module: wine Branch: master Commit: e54247b10ca75f8970a91bb18abd66d9ecaf23cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e54247b10ca75f8970a91bb18… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Mar 29 20:47:14 2007 +0200 advapi32/tests: Move check for ERROR_CALL_NOT_IMPLEMENTED to the first call. --- dlls/advapi32/tests/security.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 9da55cb..43235a0 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -857,7 +857,13 @@ static void test_token_attr(void) SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; /* cygwin-like use case */ + SetLastError(0xdeadbeef); ret = OpenProcessToken(GetCurrentProcess(), MAXIMUM_ALLOWED, &Token); + if(!ret && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) + { + skip("OpenProcessToken is not implemented\n"); + return; + } ok(ret, "OpenProcessToken failed with error %d\n", GetLastError()); if (ret) { @@ -878,15 +884,9 @@ static void test_token_attr(void) return; } + SetLastError(0xdeadbeef); ret = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY|TOKEN_DUPLICATE, &Token); - GLE = GetLastError(); - ok(ret || (GLE == ERROR_CALL_NOT_IMPLEMENTED), - "OpenProcessToken failed with error %d\n", GLE); - if(!ret && (GLE == ERROR_CALL_NOT_IMPLEMENTED)) - { - trace("OpenProcessToken() not implemented, skipping test_token_attr()\n"); - return; - } + ok(ret, "OpenProcessToken failed with error %d\n", GetLastError()); /* groups */ ret = GetTokenInformation(Token, TokenGroups, NULL, 0, &Size);

1 0

Alexander Farber : cmd: Enlarge max. length of PATH variable.
by Alexandre Julliard 29 Mar '07

29 Mar '07

Module: wine Branch: master Commit: 6ae581462397539c7afa92f8583c91f5dc0a5ade URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ae581462397539c7afa92f85… Author: Alexander Farber <Alexander.Farber(a)nokia.com> Date: Thu Mar 29 13:58:40 2007 +0200 cmd: Enlarge max. length of PATH variable. --- programs/cmd/wcmdmain.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index d49e25f..2b5644a 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -806,7 +806,7 @@ static void init_msvcrt_io_block(STARTUPINFO* st) void WCMD_run_program (char *command, int called) { char temp[MAX_PATH]; - char pathtosearch[MAX_PATH]; + char pathtosearch[MAXSTRING]; char *pathposn; char stemofsearch[MAX_PATH]; char *lastSlash; @@ -834,7 +834,7 @@ void WCMD_run_program (char *command, int called) { } else { /* Convert eg. ..\fred to include a directory by removing file part */ - GetFullPathName(param1, MAX_PATH, pathtosearch, NULL); + GetFullPathName(param1, sizeof(pathtosearch), pathtosearch, NULL); lastSlash = strrchr(pathtosearch, '\\'); if (lastSlash) *lastSlash = 0x00; if (strchr(lastSlash, '.') != NULL) extensionsupplied = TRUE;

1 0

Detlef Riekenberg : winspool.drv: Do not cache the port names.
by Alexandre Julliard 29 Mar '07

29 Mar '07

Module: wine Branch: master Commit: 4cd9d539dd49a93a6d5af5cd2f986c11492c54e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cd9d539dd49a93a6d5af5cd2… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Mar 29 17:38:16 2007 +0200 winspool.drv: Do not cache the port names. --- dlls/winspool.drv/info.c | 94 ++++++++++++++------------------------------- 1 files changed, 29 insertions(+), 65 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 0374935..7fc3e73 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -97,10 +97,6 @@ typedef struct { HMODULE hdll; DWORD refcount; DWORD dwMonitorSize; - LPPORT_INFO_2W cache; /* cached PORT_INFO_2W data */ - DWORD pi1_needed; /* size for PORT_INFO_1W */ - DWORD pi2_needed; /* size for PORT_INFO_2W */ - DWORD returned; /* number of cached PORT_INFO_2W - entries */ } monitor_t; typedef struct { @@ -838,28 +834,6 @@ static DWORD get_local_monitors(DWORD level, LPBYTE pMonitors, DWORD cbBuf, LPDW } /****************************************************************** - * monitor_flush [internal] - * - * flush the cached PORT_INFO_2W - data - */ - -static void monitor_flush(monitor_t * pm) -{ - if (!pm) return; - - EnterCriticalSection(&monitor_handles_cs); - - TRACE("%p (%s) cache: %p (%d, %d)\n", pm, debugstr_w(pm->name), pm->cache, pm->pi1_needed, pm->pi2_needed); - - HeapFree(GetProcessHeap(), 0, pm->cache); - pm->cache = NULL; - pm->pi1_needed = 0; - pm->pi2_needed = 0; - pm->returned = 0; - LeaveCriticalSection(&monitor_handles_cs); -} - -/****************************************************************** * monitor_unload [internal] * * release a printmonitor and unload it from memory, when needed @@ -1214,10 +1188,14 @@ static DWORD get_ports_from_all_monitors(DWORD level, LPBYTE pPorts, DWORD cbBuf LPWSTR ptr; LPPORT_INFO_2W cache; LPPORT_INFO_2W out; + LPBYTE pi_buffer = NULL; + DWORD pi_allocated = 0; + DWORD pi_needed; + DWORD pi_index; + DWORD pi_returned; DWORD res; - DWORD cacheindex; DWORD outindex = 0; - DWORD needed = 0; + DWORD needed; DWORD numentries; DWORD entrysize; @@ -1235,36 +1213,27 @@ static DWORD get_ports_from_all_monitors(DWORD level, LPBYTE pPorts, DWORD cbBuf LIST_FOR_EACH_ENTRY(pm, &monitor_handles, monitor_t, entry) { if ((pm->monitor) && (pm->monitor->pfnEnumPorts)) { - if (pm->cache == NULL) { - res = pm->monitor->pfnEnumPorts(NULL, 2, NULL, 0, &(pm->pi2_needed), &(pm->returned)); - if (!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { - pm->cache = HeapAlloc(GetProcessHeap(), 0, (pm->pi2_needed)); - res = pm->monitor->pfnEnumPorts(NULL, 2, (LPBYTE) pm->cache, pm->pi2_needed, &(pm->pi2_needed), &(pm->returned)); - } - TRACE("(%s) got %d with %d (cache need %d byte for %d entries)\n", - debugstr_w(pm->name), res, GetLastError(), pm->pi2_needed, pm->returned); - res = FALSE; - } - if (pm->cache && (level == 1) && (pm->pi1_needed == 0) && (pm->returned > 0)) { - cacheindex = 0; - cache = pm->cache; - while (cacheindex < (pm->returned)) { - pm->pi1_needed += sizeof(PORT_INFO_1W); - pm->pi1_needed += (lstrlenW(cache->pPortName) + 1) * sizeof(WCHAR); - cache++; - cacheindex++; - } - TRACE("%d byte for %d cached PORT_INFO_1W entries (%s)\n", - pm->pi1_needed, cacheindex, debugstr_w(pm->name)); + pi_needed = 0; + pi_returned = 0; + res = pm->monitor->pfnEnumPorts(NULL, level, pi_buffer, pi_allocated, &pi_needed, &pi_returned); + if (!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { + /* Do not use HeapReAlloc (we do not need the old data in the buffer) */ + HeapFree(GetProcessHeap(), 0, pi_buffer); + pi_buffer = HeapAlloc(GetProcessHeap(), 0, pi_needed); + pi_allocated = (pi_buffer) ? pi_needed : 0; + res = pm->monitor->pfnEnumPorts(NULL, level, pi_buffer, pi_allocated, &pi_needed, &pi_returned); } - numentries += pm->returned; - needed += (level == 1) ? pm->pi1_needed : pm->pi2_needed; - - /* fill the buffer, if we have one */ - if (pPorts && (cbBuf >= needed ) && pm->cache) { - cacheindex = 0; - cache = pm->cache; - while (cacheindex < pm->returned) { + TRACE( "(%s) got %d with %d (need %d byte for %d entries)\n", + debugstr_w(pm->name), res, GetLastError(), pi_needed, pi_returned); + + numentries += pi_returned; + needed += pi_needed; + + /* fill the output-buffer (pPorts), if we have one */ + if (pPorts && (cbBuf >= needed ) && pi_buffer) { + pi_index = 0; + while (pi_returned > pi_index) { + cache = (LPPORT_INFO_2W) &pi_buffer[pi_index * entrysize]; out = (LPPORT_INFO_2W) &pPorts[outindex * entrysize]; out->pPortName = ptr; lstrcpyW(ptr, cache->pPortName); @@ -1280,13 +1249,14 @@ static DWORD get_ports_from_all_monitors(DWORD level, LPBYTE pPorts, DWORD cbBuf out->fPortType = cache->fPortType; out->Reserved = cache->Reserved; } - cache++; - cacheindex++; + pi_index++; outindex++; } } } } + /* the temporary portinfo-buffer is no longer needed */ + HeapFree(GetProcessHeap(), 0, pi_buffer); *lpreturned = numentries; TRACE("need %d byte for %d entries\n", needed, numentries); @@ -2464,9 +2434,6 @@ BOOL WINAPI DeletePortW (LPWSTR pName, HWND hWnd, LPWSTR pPortName) } monitor_unload(pui); } - /* always invalidate cached PORT_INFO_2W */ - monitor_flush(pm); - monitor_unload(pm); TRACE("returning %d with %u\n", res, GetLastError()); @@ -6052,9 +6019,6 @@ BOOL WINAPI AddPortW(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName) } monitor_unload(pui); } - /* invalidate cached PORT_INFO_2W */ - monitor_flush(pm); - monitor_unload(pm); TRACE("returning %d with %u\n", res, GetLastError()); return res;

1 0

Alexandre Julliard : ntdll: Ignore failure to open current directory, it' s broken on Mac OS X.
by Alexandre Julliard 29 Mar '07

29 Mar '07

Module: wine Branch: master Commit: 6d1402cd89741db1dc23480f258fde711587410c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d1402cd89741db1dc23480f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 29 21:02:59 2007 +0200 ntdll: Ignore failure to open current directory, it's broken on Mac OS X. --- dlls/ntdll/directory.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 697fd1a..50aaa27 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1507,7 +1507,8 @@ NTSTATUS WINAPI NtQueryDirectoryFile( HANDLE handle, HANDLE event, if (show_dot_files == -1) init_options(); - if ((cwd = open(".", O_RDONLY)) != -1 && fchdir( fd ) != -1) + cwd = open( ".", O_RDONLY ); + if (fchdir( fd ) != -1) { #ifdef VFAT_IOCTL_READDIR_BOTH if ((read_directory_vfat( fd, io, buffer, length, single_entry, mask, restart_scan )) != -1) @@ -1526,7 +1527,7 @@ NTSTATUS WINAPI NtQueryDirectoryFile( HANDLE handle, HANDLE event, read_directory_readdir( fd, io, buffer, length, single_entry, mask, restart_scan ); done: - if (fchdir( cwd ) == -1) chdir( "/" ); + if (cwd == -1 || fchdir( cwd ) == -1) chdir( "/" ); } else io->u.Status = FILE_GetNtStatus();

1 0

Andrew Riedi : dsound: Change a couple DPRINTF's to TRACE's
by Alexandre Julliard 29 Mar '07

29 Mar '07

Module: wine Branch: master Commit: 447d5c219b7fa4ccad01f93e247fc8eed7d0c13b URL: http://source.winehq.org/git/wine.git/?a=commit;h=447d5c219b7fa4ccad01f93e2… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Wed Mar 28 08:30:16 2007 -0700 dsound: Change a couple DPRINTF's to TRACE's --- dlls/dsound/dsound.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 33df102..b10a8d3 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -146,7 +146,7 @@ static void _dump_DSCAPS(DWORD xmask) { for (i=0;i<sizeof(flags)/sizeof(flags[0]);i++) if ((flags[i].mask & xmask) == flags[i].mask) - DPRINTF("%s ",flags[i].name); + TRACE("%s ",flags[i].name); } static void _dump_DSBCAPS(DWORD xmask) { @@ -174,7 +174,7 @@ static void _dump_DSBCAPS(DWORD xmask) { for (i=0;i<sizeof(flags)/sizeof(flags[0]);i++) if ((flags[i].mask & xmask) == flags[i].mask) - DPRINTF("%s ",flags[i].name); + TRACE("%s ",flags[i].name); } /*******************************************************************************

1 0