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

Stefan Dösinger : wined3d: Implement D3DTOP_BUMPENVMAPLUMINANCE.
by Alexandre Julliard Aug. 26, 2008

Aug. 26, 2008

Module: wine Branch: master Commit: 6c12b815525a487df20ba8a359a8bf1de5154643 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c12b815525a487df20ba8a35… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 19 10:51:04 2008 -0500 wined3d: Implement D3DTOP_BUMPENVMAPLUMINANCE. --- dlls/d3d9/tests/visual.c | 88 +++++++++++++++++++++++++++++++++++-- dlls/wined3d/arb_program_shader.c | 71 +++++++++++++++++++++++++++--- 2 files changed, 149 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c12b815525a487df20ba…

1 0

Stefan Dösinger : wined3d: Fix the texcoord size mask.
by Alexandre Julliard Aug. 26, 2008

Aug. 26, 2008

Module: wine Branch: master Commit: e8b9f167d678ab76bd812184e9cc4c96ff322a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8b9f167d678ab76bd812184e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 20 10:51:45 2008 -0500 wined3d: Fix the texcoord size mask. There is room for 8 texture coordinates, not just 4. --- dlls/d3d9/vertexdeclaration.c | 2 +- dlls/wined3d/device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index d38baaa..327c741 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -71,7 +71,7 @@ HRESULT vdecl_convert_fvf( BOOL has_specular = (fvf & D3DFVF_SPECULAR) !=0; DWORD num_textures = (fvf & D3DFVF_TEXCOUNT_MASK) >> D3DFVF_TEXCOUNT_SHIFT; - DWORD texcoords = (fvf & 0x00FF0000) >> 16; + DWORD texcoords = (fvf & 0xFFFF0000) >> 16; D3DVERTEXELEMENT9 end_element = D3DDECL_END(); D3DVERTEXELEMENT9 *elements = NULL; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 350c6d5..4ff206d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1735,7 +1735,7 @@ static unsigned int ConvertFvfToDeclaration(IWineD3DDeviceImpl *This, /* For the BOOL has_specular = (fvf & WINED3DFVF_SPECULAR) !=0; DWORD num_textures = (fvf & WINED3DFVF_TEXCOUNT_MASK) >> WINED3DFVF_TEXCOUNT_SHIFT; - DWORD texcoords = (fvf & 0x00FF0000) >> 16; + DWORD texcoords = (fvf & 0xFFFF0000) >> 16; WINED3DVERTEXELEMENT end_element = WINED3DDECL_END(); WINED3DVERTEXELEMENT *elements = NULL;

1 0

Stefan Dösinger : ddraw: Don't destroy the application 's window.
by Alexandre Julliard Aug. 26, 2008

Aug. 26, 2008

Module: wine Branch: master Commit: 58ac095d9dc5f8e6776f7acf57363ee9f303a444 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58ac095d9dc5f8e6776f7acf5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 25 09:13:30 2008 -0500 ddraw: Don't destroy the application's window. --- dlls/ddraw/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 664229b..fc481e4 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -331,7 +331,7 @@ IDirectDrawSurfaceImpl_Release(IDirectDrawSurface7 *iface) else { /* Free the d3d window if one was created */ - if(ddraw->d3d_window != 0) + if(ddraw->d3d_window != 0 && ddraw->d3d_window != ddraw->dest_window) { TRACE(" (%p) Destroying the hidden render window %p\n", This, ddraw->d3d_window); DestroyWindow(ddraw->d3d_window);

1 0

Damjan Jovanovic : oleaut32: Thousands separator support for VarFormat.
by Alexandre Julliard Aug. 26, 2008

Aug. 26, 2008

Module: wine Branch: master Commit: 506ff74bb17742b3be5a8824dc081a3e294ccf1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=506ff74bb17742b3be5a8824d… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Aug 25 20:40:20 2008 +0200 oleaut32: Thousands separator support for VarFormat. --- dlls/oleaut32/tests/varformat.c | 5 ++- dlls/oleaut32/varformat.c | 48 +++++++++++++++++++++++++++++++++++++- 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 4098927..47fb8e6 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -324,9 +324,10 @@ static void test_VarFormat(void) VARFMT(VT_I4,V_I4,1,"000###",S_OK,"000001"); VARFMT(VT_I4,V_I4,1,"#00##00#0",S_OK,"00000001"); VARFMT(VT_I4,V_I4,1,"1#####0000",S_OK,"10001"); - todo_wine { VARFMT(VT_I4,V_I4,100000,"#,###,###,###",S_OK,"100,000"); - } + VARFMT(VT_I4,V_I4,1,"0,000,000,000",S_OK,"0,000,000,001"); + VARFMT(VT_I4,V_I4,123456789,"#,#.#",S_OK,"123,456,789."); + VARFMT(VT_I4,V_I4,123456789,"###, ###, ###",S_OK,"123, 456, 789"); VARFMT(VT_R8,V_R8,1.23456789,"0#.0#0#0#0#0",S_OK,"01.234567890"); VARFMT(VT_R8,V_R8,1.2,"0#.0#0#0#0#0",S_OK,"01.200000000"); VARFMT(VT_R8,V_R8,9.87654321,"#0.#0#0#0#0#",S_OK,"9.87654321"); diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 887525c..27735fc 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -1193,6 +1193,7 @@ static HRESULT VARIANT_FormatNumber(LPVARIANT pVarIn, LPOLESTR lpszFormat, NUMPARSE np; int have_int, need_int = 0, have_frac, need_frac, exponent = 0, pad = 0; WCHAR buff[256], *pBuff = buff; + WCHAR thousandSeparator[32]; VARIANT vString, vBool; DWORD dwState = 0; FMT_HEADER *header = (FMT_HEADER*)rgbTok; @@ -1315,6 +1316,16 @@ static HRESULT VARIANT_FormatNumber(LPVARIANT pVarIn, LPOLESTR lpszFormat, have_int, need_int, have_frac, need_frac, pad, exponent); } + if (numHeader->flags & FMT_FLAG_THOUSANDS) + { + if (!GetLocaleInfoW(lcid, LOCALE_STHOUSAND, thousandSeparator, + sizeof(thousandSeparator)/sizeof(WCHAR))) + { + thousandSeparator[0] = ','; + thousandSeparator[1] = 0; + } + } + pToken = (const BYTE*)numHeader + sizeof(FMT_NUMBER_HEADER); prgbDig = rgbDig; @@ -1463,7 +1474,7 @@ VARIANT_FormatNumber_Bool: } else { - int count, count_max; + int count, count_max, position; if ((np.dwOutFlags & NUMPRS_NEG) && !(dwState & NUM_WROTE_SIGN)) { @@ -1475,6 +1486,9 @@ VARIANT_FormatNumber_Bool: break; } + position = have_int + pad; + if (dwState & NUM_WRITE_ON) + position = max(position, need_int); need_int -= pToken[1]; count_max = have_int + pad - need_int; if (count_max < 0) @@ -1484,25 +1498,55 @@ VARIANT_FormatNumber_Bool: count = pToken[1] - count_max; TRACE("write %d leading zeros\n", count); while (count-- > 0) + { *pBuff++ = '0'; + if ((numHeader->flags & FMT_FLAG_THOUSANDS) && + position > 1 && (--position % 3) == 0) + { + int k; + TRACE("write thousand separator\n"); + for (k = 0; thousandSeparator[k]; k++) + *pBuff++ = thousandSeparator[k]; + } + } } if (*pToken == FMT_NUM_COPY_ZERO || have_int > 1 || (have_int > 0 && *prgbDig > 0)) { - dwState |= NUM_WRITE_ON; count = min(count_max, have_int); count_max -= count; have_int -= count; TRACE("write %d whole number digits\n", count); while (count--) + { + dwState |= NUM_WRITE_ON; *pBuff++ = '0' + *prgbDig++; + if ((numHeader->flags & FMT_FLAG_THOUSANDS) && + position > 1 && (--position % 3) == 0) + { + int k; + TRACE("write thousand separator\n"); + for (k = 0; thousandSeparator[k]; k++) + *pBuff++ = thousandSeparator[k]; + } + } } count = min(count_max, pad); count_max -= count; pad -= count; TRACE("write %d whole trailing 0's\n", count); while (count--) + { *pBuff++ = '0'; + if ((numHeader->flags & FMT_FLAG_THOUSANDS) && + position > 1 && (--position % 3) == 0) + { + int k; + TRACE("write thousand separator\n"); + for (k = 0; thousandSeparator[k]; k++) + *pBuff++ = thousandSeparator[k]; + } + } } pToken++; break;

1 0

Andrew Talbot : dxdiagn: Sign-compare warning fix.
by Alexandre Julliard Aug. 26, 2008

Aug. 26, 2008

Module: wine Branch: master Commit: b31766fee6d558adafae82e33d70f753a39be6b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b31766fee6d558adafae82e33… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Aug 25 15:36:12 2008 +0100 dxdiagn: Sign-compare warning fix. --- dlls/dxdiagn/container.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index 9172fa7..c4278b1 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -194,8 +194,8 @@ static HRESULT WINAPI IDxDiagContainerImpl_EnumPropNames(PDXDIAGCONTAINER iface, p = This->properties; while (NULL != p) { if (dwIndex == i) { - if (cchPropName <= lstrlenW(p->vName)) { - return DXDIAG_E_INSUFFICIENT_BUFFER; + if (cchPropName <= strlenW(p->vName)) { + return DXDIAG_E_INSUFFICIENT_BUFFER; } lstrcpynW(pwszPropName, p->vName, cchPropName); return S_OK;

1 0

Paul Vriens : kernel32/tests: Use skip instead of trace.
by Alexandre Julliard Aug. 26, 2008

Aug. 26, 2008

Module: wine Branch: master Commit: 56ba2baa01973f40de64c4d9702158de2fb1d341 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56ba2baa01973f40de64c4d97… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Aug 25 17:55:25 2008 +0200 kernel32/tests: Use skip instead of trace. --- dlls/kernel32/tests/locale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 59d02cf..f792da2 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1193,7 +1193,7 @@ static void test_LCMapStringW(void) upper_case, -1, buf, sizeof(buf)/sizeof(WCHAR)); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - trace("Skipping LCMapStringW tests on Win9x\n"); + win_skip("LCMapStringW is not implemented\n"); return; } ok(!ret, "LCMAP_LOWERCASE and LCMAP_UPPERCASE are mutually exclusive\n");

1 0

Paul Vriens : kernel32/tests: Use a file that is available on all platforms .
by Alexandre Julliard Aug. 26, 2008

Aug. 26, 2008

Module: wine Branch: master Commit: ac07480fab24861467f80320cce9b34059198018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac07480fab24861467f80320c… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Aug 25 17:22:44 2008 +0200 kernel32/tests: Use a file that is available on all platforms. --- dlls/kernel32/tests/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 3502e83..5b8b00d 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1667,7 +1667,7 @@ static void test_OpenFile(void) BOOL ret; DWORD retval; - static const char *file = "\\regsvr32.exe"; + static const char *file = "\\regedit.exe"; static const char *foo = ".\\foo-bar-foo.baz"; static const char *foo_too_long = ".\\foo-bar-foo.baz+++++++++++++++" "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" @@ -1682,7 +1682,7 @@ static void test_OpenFile(void) UINT length; /* Check for existing file */ - length = GetSystemDirectoryA(buff, MAX_PATH); + length = GetWindowsDirectoryA(buff, MAX_PATH); if (length + lstrlen(file) < MAX_PATH) {

1 0

Paul Vriens : advapi32/tests: Don't test unimplemented functions.
by Alexandre Julliard Aug. 26, 2008

Aug. 26, 2008

Module: wine Branch: master Commit: 70c7cd2bd6567e93e4217eda61970a3e139852d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c7cd2bd6567e93e4217eda6… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Aug 25 14:16:25 2008 +0200 advapi32/tests: Don't test unimplemented functions. --- dlls/advapi32/tests/security.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index f2bafce..9b3f7e6 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -101,6 +101,8 @@ static NTSTATUS (WINAPI *pNtQueryObject)(HANDLE,OBJECT_INFORMATION_CLASS,PVOID,U static DWORD (WINAPI *pSetEntriesInAclW)(ULONG, PEXPLICIT_ACCESSW, PACL, PACL*); static BOOL (WINAPI *pSetSecurityDescriptorControl)(PSECURITY_DESCRIPTOR, SECURITY_DESCRIPTOR_CONTROL, SECURITY_DESCRIPTOR_CONTROL); +static DWORD (WINAPI *pGetSecurityInfo)(HANDLE, SE_OBJECT_TYPE, SECURITY_INFORMATION, + PSID*, PSID*, PACL*, PACL*, PSECURITY_DESCRIPTOR*); static HMODULE hmod; static int myARGC; @@ -149,6 +151,7 @@ static void init(void) pMakeSelfRelativeSD = (void *)GetProcAddress(hmod, "MakeSelfRelativeSD"); pSetEntriesInAclW = (void *)GetProcAddress(hmod, "SetEntriesInAclW"); pSetSecurityDescriptorControl = (void *)GetProcAddress(hmod, "SetSecurityDescriptorControl"); + pGetSecurityInfo = (void *)GetProcAddress(hmod, "GetSecurityInfo"); myARGC = winetest_get_mainargs( &myARGV ); } @@ -2493,6 +2496,12 @@ static void test_GetSecurityInfo(void) PACL dacl; DWORD ret; + if (!pGetSecurityInfo) + { + win_skip("GetSecurityInfo is not available\n"); + return; + } + /* Create something. Files have lots of associated security info. */ obj = CreateFile(myARGV[0], GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); @@ -2502,9 +2511,15 @@ static void test_GetSecurityInfo(void) return; } - ret = GetSecurityInfo(obj, SE_FILE_OBJECT, + ret = pGetSecurityInfo(obj, SE_FILE_OBJECT, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, &owner, &group, &dacl, NULL, &sd); + if (ret == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("GetSecurityInfo is not implemented\n"); + CloseHandle(obj); + return; + } ok(ret == ERROR_SUCCESS, "GetSecurityInfo returned %d\n", ret); ok(sd != NULL, "GetSecurityInfo\n"); ok(owner != NULL, "GetSecurityInfo\n"); @@ -2516,7 +2531,7 @@ static void test_GetSecurityInfo(void) /* If we don't ask for the security descriptor, Windows will still give us the other stuff, leaving us no way to free it. */ - ret = GetSecurityInfo(obj, SE_FILE_OBJECT, + ret = pGetSecurityInfo(obj, SE_FILE_OBJECT, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, &owner, &group, &dacl, NULL, NULL); ok(ret == ERROR_SUCCESS, "GetSecurityInfo returned %d\n", ret);

1 0

Paul Vriens : kernel32/tests: Fix two failures on win9x.
by Alexandre Julliard Aug. 26, 2008

Aug. 26, 2008

Module: wine Branch: master Commit: 920c1fc77afc82a3a6674bc16beaeed8e58f8a4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=920c1fc77afc82a3a6674bc16… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Aug 25 16:48:31 2008 +0200 kernel32/tests: Fix two failures on win9x. --- dlls/kernel32/tests/file.c | 8 ++++++-- include/winnt.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 4730ec4..3502e83 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1353,7 +1353,9 @@ static void test_FindFirstFileA(void) ok( 0 == lstrcmpiA(data.cFileName, "nul"), "wrong name %s\n", data.cFileName ); ok( 0 == data.nFileSizeHigh, "wrong size %d\n", data.nFileSizeHigh ); ok( 0 == data.nFileSizeLow, "wrong size %d\n", data.nFileSizeLow ); - ok( FILE_ATTRIBUTE_ARCHIVE == data.dwFileAttributes, "wrong attributes %x\n", data.dwFileAttributes ); + ok( FILE_ATTRIBUTE_ARCHIVE == data.dwFileAttributes || + FILE_ATTRIBUTE_DEVICE == data.dwFileAttributes /* Win9x */, + "wrong attributes %x\n", data.dwFileAttributes ); SetLastError( 0xdeadbeaf ); ok( !FindNextFileA( handle, &data ), "FindNextFileA succeeded\n" ); ok( GetLastError() == ERROR_NO_MORE_FILES, "bad error %d\n", GetLastError() ); @@ -1368,7 +1370,9 @@ static void test_FindFirstFileA(void) ok( 0 == lstrcmpiA(data.cFileName, "lpt1"), "wrong name %s\n", data.cFileName ); ok( 0 == data.nFileSizeHigh, "wrong size %d\n", data.nFileSizeHigh ); ok( 0 == data.nFileSizeLow, "wrong size %d\n", data.nFileSizeLow ); - ok( FILE_ATTRIBUTE_ARCHIVE == data.dwFileAttributes, "wrong attributes %x\n", data.dwFileAttributes ); + ok( FILE_ATTRIBUTE_ARCHIVE == data.dwFileAttributes || + FILE_ATTRIBUTE_DEVICE == data.dwFileAttributes /* Win9x */, + "wrong attributes %x\n", data.dwFileAttributes ); SetLastError( 0xdeadbeaf ); ok( !FindNextFileA( handle, &data ), "FindNextFileA succeeded\n" ); ok( GetLastError() == ERROR_NO_MORE_FILES, "bad error %d\n", GetLastError() ); diff --git a/include/winnt.h b/include/winnt.h index e8a37f5..7ca80a7 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4118,6 +4118,7 @@ typedef struct _QUOTA_LIMITS_EX { #define FILE_ATTRIBUTE_SYSTEM 0x00000004 #define FILE_ATTRIBUTE_DIRECTORY 0x00000010 #define FILE_ATTRIBUTE_ARCHIVE 0x00000020 +#define FILE_ATTRIBUTE_DEVICE 0x00000040 #define FILE_ATTRIBUTE_NORMAL 0x00000080 #define FILE_ATTRIBUTE_TEMPORARY 0x00000100 #define FILE_ATTRIBUTE_SPARSE_FILE 0x00000200

1 0

Paul Vriens : advapi32/tests: SC_MANAGER_ENUMERATE_SERVICE is enough.
by Alexandre Julliard Aug. 26, 2008

Aug. 26, 2008

Module: wine Branch: master Commit: e3bd938bd1482502f92e251ec8fca6009464b7d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3bd938bd1482502f92e251ec… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Aug 25 10:52:03 2008 +0200 advapi32/tests: SC_MANAGER_ENUMERATE_SERVICE is enough. --- dlls/advapi32/tests/service.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 55f3040..1cf0f62 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1068,7 +1068,7 @@ static void test_enum_svc(void) /* Open the service control manager with the needed rights */ CloseServiceHandle(scm_handle); - scm_handle = OpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT | SC_MANAGER_ENUMERATE_SERVICE); + scm_handle = OpenSCManagerA(NULL, NULL, SC_MANAGER_ENUMERATE_SERVICE); /* All parameters are correct. Request the needed buffer size */ needed = 0xdeadbeef; @@ -1438,7 +1438,7 @@ static void test_enum_svc(void) /* Open the service control manager with the needed rights */ CloseServiceHandle(scm_handle); - scm_handle = OpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT | SC_MANAGER_ENUMERATE_SERVICE); + scm_handle = OpenSCManagerA(NULL, NULL, SC_MANAGER_ENUMERATE_SERVICE); /* All parameters are correct and the group will be checked */ needed = 0xdeadbeef;

1 0