November 2005 - Wine-Commits

wine/dlls ntdll/file.c kernel/tests/pipe.c
by Alexandre Julliard Nov. 14, 2005

Nov. 14, 2005

ChangeSet ID: 21260 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/14 09:11:11 Modified files: dlls/ntdll : file.c dlls/kernel/tests: pipe.c Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> NtReadFile: now returning correct status in NtReadFile for EOF conditions (on files) and broken pipe (on named pipes). Patch: http://cvs.winehq.org/patch.py?id=21260 Old revision New revision Changes Path 1.103 1.104 +9 -1 wine/dlls/ntdll/file.c 1.21 1.22 +1 -1 wine/dlls/kernel/tests/pipe.c Index: wine/dlls/ntdll/file.c diff -u -p wine/dlls/ntdll/file.c:1.103 wine/dlls/ntdll/file.c:1.104 --- wine/dlls/ntdll/file.c:1.103 14 Nov 2005 15:11:11 -0000 +++ wine/dlls/ntdll/file.c 14 Nov 2005 15:11:11 -0000 @@ -589,8 +589,16 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, else io_status->u.Status = FILE_GetNtStatus(); break; } + if (io_status->u.Status == STATUS_SUCCESS && io_status->Information == 0) + { + struct stat st; + if (fstat( unix_handle, &st ) != -1 && S_ISSOCK( st.st_mode )) + io_status->u.Status = STATUS_PIPE_BROKEN; + else + io_status->u.Status = STATUS_END_OF_FILE; + } wine_server_release_fd( hFile, unix_handle ); - TRACE("= 0x%08lx\n", io_status->u.Status); + TRACE("= 0x%08lx (%lu)\n", io_status->u.Status, io_status->Information); return io_status->u.Status; } Index: wine/dlls/kernel/tests/pipe.c diff -u -p wine/dlls/kernel/tests/pipe.c:1.21 wine/dlls/kernel/tests/pipe.c:1.22 --- wine/dlls/kernel/tests/pipe.c:1.21 14 Nov 2005 15:11:11 -0000 +++ wine/dlls/kernel/tests/pipe.c 14 Nov 2005 15:11:11 -0000 @@ -757,7 +757,7 @@ static void test_CreatePipe(void) ok(ReadFile(piperead,readbuf,sizeof(readbuf),&read, NULL), "Read from broken pipe withe with pending data failed\n"); ok(read == sizeof(PIPENAME), "Read from anonymous pipe got %ld bytes instead of %d\n", read, sizeof(PIPENAME)); /* But now we need to get informed that the pipe is closed */ - todo_wine ok(ReadFile(piperead,readbuf,sizeof(readbuf),&read, NULL) == 0, "Broken pipe not detected\n"); + ok(ReadFile(piperead,readbuf,sizeof(readbuf),&read, NULL) == 0, "Broken pipe not detected\n"); } START_TEST(pipe)

1 0

wine/dlls/gdi tests/bitmap.c dib.c
by Alexandre Julliard Nov. 14, 2005

Nov. 14, 2005

ChangeSet ID: 21259 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/14 09:10:23 Modified files: dlls/gdi/tests : bitmap.c dlls/gdi : dib.c Log message: Peter Beutner <p.beutner(a)gmx.net> When creating DIBs with a color depth <= 8, always set biClrUsed field to the number of entries in the color table. Patch: http://cvs.winehq.org/patch.py?id=21259 Old revision New revision Changes Path 1.8 1.9 +27 -0 wine/dlls/gdi/tests/bitmap.c 1.14 1.15 +4 -0 wine/dlls/gdi/dib.c Index: wine/dlls/gdi/tests/bitmap.c diff -u -p wine/dlls/gdi/tests/bitmap.c:1.8 wine/dlls/gdi/tests/bitmap.c:1.9 --- wine/dlls/gdi/tests/bitmap.c:1.8 14 Nov 2005 15:10:23 -0000 +++ wine/dlls/gdi/tests/bitmap.c 14 Nov 2005 15:10:23 -0000 @@ -194,6 +194,7 @@ static void test_dibsections(void) WORD *index; DWORD *bits32; HPALETTE hpal, oldpal; + DIBSECTION dibsec; COLORREF c0, c1; int i; int screen_depth; @@ -216,6 +217,9 @@ static void test_dibsections(void) hdib = CreateDIBSection(hdc, pbmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); ok(hdib != NULL, "CreateDIBSection failed\n"); + ok(GetObject(hdib, sizeof(DIBSECTION), &dibsec) != 0, "GetObject failed for DIBSection\n"); + ok(dibsec.dsBmih.biClrUsed == 2, + "created DIBSection: wrong biClrUsed field: %lu, should be: %u\n", dibsec.dsBmih.biClrUsed, 2); /* Test if the old BITMAPCOREINFO structure is supported */ @@ -280,6 +284,19 @@ static void test_dibsections(void) SelectObject(hdcmem, oldbm); DeleteObject(hdib); + pbmi->bmiHeader.biBitCount = 4; + for (i = 0; i < 16; i++) { + pbmi->bmiColors[i].rgbRed = i; + pbmi->bmiColors[i].rgbGreen = 16-i; + pbmi->bmiColors[i].rgbBlue = 0; + } + hdib = CreateDIBSection(hdcmem, pbmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok(hdib != NULL, "CreateDIBSection failed\n"); + ok(GetObject(hdib, sizeof(DIBSECTION), &dibsec) != 0, "GetObject failed for DIB Section\n"); + ok(dibsec.dsBmih.biClrUsed == 16, + "created DIBSection: wrong biClrUsed field: %lu, should be: %u\n", dibsec.dsBmih.biClrUsed, 16); + DeleteObject(hdib); + pbmi->bmiHeader.biBitCount = 8; for (i = 0; i < 128; i++) { @@ -292,6 +309,10 @@ static void test_dibsections(void) } hdib = CreateDIBSection(hdcmem, pbmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); ok(hdib != NULL, "CreateDIBSection failed\n"); + ok(GetObject(hdib, sizeof(DIBSECTION), &dibsec) != 0, "GetObject failed for DIB Section\n"); + ok(dibsec.dsBmih.biClrUsed == 256, + "created DIBSection: wrong biClrUsed field: %lu, should be: %u\n", dibsec.dsBmih.biClrUsed, 256); + oldbm = SelectObject(hdcmem, hdib); for (i = 0; i < 256; i++) { @@ -322,6 +343,9 @@ static void test_dibsections(void) oldpal = SelectPalette(hdc, hpal, TRUE); hdib = CreateDIBSection(hdc, pbmi, DIB_PAL_COLORS, (void**)&bits, NULL, 0); ok(hdib != NULL, "CreateDIBSection failed\n"); + ok(GetObject(hdib, sizeof(DIBSECTION), &dibsec) != 0, "GetObject failed for DIB Section\n"); + ok(dibsec.dsBmih.biClrUsed == 2, + "created DIBSection: wrong biClrUsed field: %lu, should be: %u\n", dibsec.dsBmih.biClrUsed, 2); /* The colour table has already been grabbed from the dc, so we select back the old palette */ @@ -409,6 +433,9 @@ static void test_dibsections(void) oldpal = SelectPalette(hdc, hpal, TRUE); hdib = CreateDIBSection(hdc, pbmi, DIB_PAL_COLORS, (void**)&bits, NULL, 0); ok(hdib != NULL, "CreateDIBSection failed\n"); + ok(GetObject(hdib, sizeof(DIBSECTION), &dibsec) != 0, "GetObject failed for DIB Section\n"); + ok(dibsec.dsBmih.biClrUsed == 256, + "created DIBSection: wrong biClrUsed field: %lu, should be: %u\n", dibsec.dsBmih.biClrUsed, 256); SelectPalette(hdc, oldpal, TRUE); oldbm = SelectObject(hdcmem, hdib); Index: wine/dlls/gdi/dib.c diff -u -p wine/dlls/gdi/dib.c:1.14 wine/dlls/gdi/dib.c:1.15 --- wine/dlls/gdi/dib.c:1.14 14 Nov 2005 15:10:23 -0000 +++ wine/dlls/gdi/dib.c 14 Nov 2005 15:10:23 -0000 @@ -1180,6 +1180,10 @@ HBITMAP DIB_CreateDIBSection(HDC hdc, co dib->dsBmih.biSize = sizeof(BITMAPINFOHEADER); } + /* set number of entries in bmi.bmiColors table */ + if( bpp <= 8 ) + dib->dsBmih.biClrUsed = 1 << bpp; + /* only use sizeImage if it's valid and we're dealing with a compressed bitmap */ if (sizeImage && (compression == BI_RLE4 || compression == BI_RLE8)) dib->dsBmih.biSizeImage = sizeImage;

1 0

wine/dlls/msi tests/package.c cond.y
by Alexandre Julliard Nov. 14, 2005

Nov. 14, 2005

ChangeSet ID: 21258 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/14 06:29:10 Modified files: dlls/msi/tests : package.c dlls/msi : cond.y Log message: Mike McCormack <mike(a)codeweavers.com> Empty strings are not equal to any number, so all comparisons against them fail except for tests for non-equalness. Patch: http://cvs.winehq.org/patch.py?id=21258 Old revision New revision Changes Path 1.11 1.12 +20 -0 wine/dlls/msi/tests/package.c 1.26 1.27 +8 -2 wine/dlls/msi/cond.y Index: wine/dlls/msi/tests/package.c diff -u -p wine/dlls/msi/tests/package.c:1.11 wine/dlls/msi/tests/package.c:1.12 --- wine/dlls/msi/tests/package.c:1.11 14 Nov 2005 12:29:10 -0000 +++ wine/dlls/msi/tests/package.c 14 Nov 2005 12:29:10 -0000 @@ -599,6 +599,24 @@ void test_condition(void) r = MsiEvaluateCondition(hpkg, "bandalmael=0"); ok( r == MSICONDITION_FALSE, "wrong return val\n"); + r = MsiEvaluateCondition(hpkg, "bandalmael<>0"); + ok( r == MSICONDITION_TRUE, "wrong return val\n"); + + r = MsiEvaluateCondition(hpkg, "bandalmael<0"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + + r = MsiEvaluateCondition(hpkg, "bandalmael>0"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + + r = MsiEvaluateCondition(hpkg, "bandalmael>=0"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + + r = MsiEvaluateCondition(hpkg, "bandalmael<=0"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + + r = MsiEvaluateCondition(hpkg, "bandalmael~<>0"); + ok( r == MSICONDITION_TRUE, "wrong return val\n"); + MsiSetProperty(hpkg, "bandalmael", "0" ); r = MsiEvaluateCondition(hpkg, "bandalmael=0"); ok( r == MSICONDITION_TRUE, "wrong return val\n"); @@ -646,6 +664,8 @@ void test_condition(void) MsiSetProperty(hpkg, "bandalmael", "0.0" ); r = MsiEvaluateCondition(hpkg, "bandalmael=0"); ok( r == MSICONDITION_FALSE, "wrong return val\n"); + r = MsiEvaluateCondition(hpkg, "bandalmael<>0"); + ok( r == MSICONDITION_TRUE, "wrong return val\n"); MsiCloseHandle( hpkg ); } Index: wine/dlls/msi/cond.y diff -u -p wine/dlls/msi/cond.y:1.26 wine/dlls/msi/cond.y:1.27 --- wine/dlls/msi/cond.y:1.26 14 Nov 2005 12:29:10 -0000 +++ wine/dlls/msi/cond.y 14 Nov 2005 12:29:10 -0000 @@ -194,12 +194,18 @@ boolean_factor: | symbol_s operator value_i { int num; - $$ = num_from_prop( $1, &num ) && compare_int( num, $2, $3 ); + if (num_from_prop( $1, &num )) + $$ = compare_int( num, $2, $3 ); + else + $$ = ($2 == COND_NE || $2 == COND_INE ); } | value_i operator symbol_s { int num; - $$ = num_from_prop( $3, &num ) && compare_int( $1, $2, num ); + if (num_from_prop( $3, &num )) + $$ = compare_int( $1, $2, num ); + else + $$ = ($2 == COND_NE || $2 == COND_INE ); } | symbol_s operator symbol_s {

1 0

wine/dlls/wined3d device.c
by Alexandre Julliard Nov. 14, 2005

Nov. 14, 2005

ChangeSet ID: 21257 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/14 06:28:59 Modified files: dlls/wined3d : device.c Log message: Oliver Stieber <oliver_stieber(a)yahoo.co.uk> Fix an intermittent lockup with ATI's driver, I expect the problem is trying to clear the display before it's visible. Also correct the clear alpha value. Patch: http://cvs.winehq.org/patch.py?id=21257 Old revision New revision Changes Path 1.95 1.96 +1 -2 wine/dlls/wined3d/device.c Index: wine/dlls/wined3d/device.c diff -u -p wine/dlls/wined3d/device.c:1.95 wine/dlls/wined3d/device.c:1.96 --- wine/dlls/wined3d/device.c:1.95 14 Nov 2005 12:28:59 -0000 +++ wine/dlls/wined3d/device.c 14 Nov 2005 12:28:59 -0000 @@ -1446,13 +1446,12 @@ HRESULT WINAPI IWineD3DDeviceImpl_Create TRACE("Setting up the screen\n"); /* Clear the screen */ - glClearColor(0.0, 0.0, 0.0, 0.0); + glClearColor(1.0, 0.0, 0.0, 0.0); checkGLcall("glClearColor"); glClearIndex(0); glClearDepth(1); glClearStencil(0xffff); - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_ACCUM_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); checkGLcall("glClear"); glColor3f(1.0, 1.0, 1.0);

1 0

wine/dlls/urlmon urlmon_main.h session.c inter ...
by Alexandre Julliard Nov. 14, 2005

Nov. 14, 2005

ChangeSet ID: 21256 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/14 06:28:19 Modified files: dlls/urlmon : urlmon_main.h session.c internet.c Log message: Jacek Caban <jack(a)itma.pwr.wroc.pl> Added get_protocol_iface internal function and use it in get_protocol_info. Patch: http://cvs.winehq.org/patch.py?id=21256 Old revision New revision Changes Path 1.14 1.15 +2 -0 wine/dlls/urlmon/urlmon_main.h 1.3 1.4 +47 -0 wine/dlls/urlmon/session.c 1.4 1.5 +5 -36 wine/dlls/urlmon/internet.c Index: wine/dlls/urlmon/urlmon_main.h diff -u -p wine/dlls/urlmon/urlmon_main.h:1.14 wine/dlls/urlmon/urlmon_main.h:1.15 --- wine/dlls/urlmon/urlmon_main.h:1.14 14 Nov 2005 12:28:19 -0000 +++ wine/dlls/urlmon/urlmon_main.h 14 Nov 2005 12:28:19 -0000 @@ -54,4 +54,6 @@ typedef struct HRESULT UMCreateStreamOnCacheFile(LPCWSTR pszURL, DWORD dwSize, LPWSTR pszFileName, HANDLE *phfile, IUMCacheStream **ppstr); void UMCloseCacheFileStream(IUMCacheStream *pstr); +HRESULT get_protocol_iface(LPCWSTR url, IUnknown **ret); + #endif /* __WINE_URLMON_MAIN_H */ Index: wine/dlls/urlmon/session.c diff -u -p wine/dlls/urlmon/session.c:1.3 wine/dlls/urlmon/session.c:1.4 --- wine/dlls/urlmon/session.c:1.3 14 Nov 2005 12:28:19 -0000 +++ wine/dlls/urlmon/session.c 14 Nov 2005 12:28:19 -0000 @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" +#include "winreg.h" #include "ole2.h" #include "urlmon.h" #include "urlmon_main.h" @@ -31,6 +32,52 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); +HRESULT get_protocol_iface(LPCWSTR url, IUnknown **ret) +{ + WCHAR schema[64], str_clsid[64]; + HKEY hkey = NULL; + DWORD res, type, size, schema_len; + CLSID clsid; + LPWSTR wszKey; + HRESULT hres; + + static const WCHAR wszProtocolsKey[] = + {'P','R','O','T','O','C','O','L','S','\\','H','a','n','d','l','e','r','\\'}; + static const WCHAR wszCLSID[] = {'C','L','S','I','D',0}; + + hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(schema[0]), + &schema_len, 0); + if(FAILED(hres) || !schema_len) + return E_FAIL; + + wszKey = HeapAlloc(GetProcessHeap(), 0, sizeof(wszProtocolsKey)+(schema_len+1)*sizeof(WCHAR)); + memcpy(wszKey, wszProtocolsKey, sizeof(wszProtocolsKey)); + memcpy(wszKey + sizeof(wszProtocolsKey)/sizeof(WCHAR), schema, (schema_len+1)*sizeof(WCHAR)); + + res = RegOpenKeyW(HKEY_CLASSES_ROOT, wszKey, &hkey); + HeapFree(GetProcessHeap(), 0, wszKey); + if(res != ERROR_SUCCESS) { + TRACE("Could not open key %s\n", debugstr_w(wszKey)); + return E_FAIL; + } + + size = sizeof(str_clsid); + res = RegQueryValueExW(hkey, wszCLSID, NULL, &type, (LPBYTE)str_clsid, &size); + RegCloseKey(hkey); + if(res != ERROR_SUCCESS || type != REG_SZ) { + WARN("Could not get protocol CLSID res=%ld\n", res); + return E_FAIL; + } + + hres = CLSIDFromString(str_clsid, &clsid); + if(FAILED(hres)) { + WARN("CLSIDFromString failed: %08lx\n", hres); + return hres; + } + + return CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)ret); +} + static HRESULT WINAPI InternetSession_QueryInterface(IInternetSession *iface, REFIID riid, void **ppv) { Index: wine/dlls/urlmon/internet.c diff -u -p wine/dlls/urlmon/internet.c:1.4 wine/dlls/urlmon/internet.c:1.5 --- wine/dlls/urlmon/internet.c:1.4 14 Nov 2005 12:28:19 -0000 +++ wine/dlls/urlmon/internet.c 14 Nov 2005 12:28:19 -0000 @@ -64,47 +64,16 @@ static HRESULT parse_schema(LPCWSTR url, static IInternetProtocolInfo *get_protocol_info(LPCWSTR url) { IInternetProtocolInfo *ret = NULL; - WCHAR schema[64], str_clsid[64]; - HKEY hkey = NULL; - DWORD res, type, size, schema_len; - CLSID clsid; - LPWSTR wszKey; + IUnknown *unk; HRESULT hres; - static const WCHAR wszProtocolsKey[] = - {'P','R','O','T','O','C','O','L','S','\\','H','a','n','d','l','e','r','\\'}; - static const WCHAR wszCLSID[] = {'C','L','S','I','D',0}; - - hres = parse_schema(url, 0, schema, sizeof(schema)/sizeof(schema[0]), &schema_len); - if(FAILED(hres) || !schema_len) - return NULL; - - wszKey = HeapAlloc(GetProcessHeap(), 0, sizeof(wszProtocolsKey)+(schema_len+1)*sizeof(WCHAR)); - memcpy(wszKey, wszProtocolsKey, sizeof(wszProtocolsKey)); - memcpy(wszKey + sizeof(wszProtocolsKey)/sizeof(WCHAR), schema, (schema_len+1)*sizeof(WCHAR)); - - res = RegOpenKeyW(HKEY_CLASSES_ROOT, wszKey, &hkey); - HeapFree(GetProcessHeap(), 0, wszKey); - if(res != ERROR_SUCCESS) { - TRACE("Could not open key %s\n", debugstr_w(wszKey)); - return NULL; - } - - size = sizeof(str_clsid); - res = RegQueryValueExW(hkey, wszCLSID, NULL, &type, (LPBYTE)str_clsid, &size); - RegCloseKey(hkey); - if(res != ERROR_SUCCESS || type != REG_SZ) { - WARN("Could not get protocol CLSID res=%ld\n", res); + hres = get_protocol_iface(url, &unk); + if(FAILED(hres)) return NULL; - } - hres = CLSIDFromString(str_clsid, &clsid); - if(FAILED(hres)) { - WARN("CLSIDFromString failed: %08lx\n", hres); - return NULL; - } + IUnknown_QueryInterface(unk, &IID_IInternetProtocolInfo, (void**)&ret); + IUnknown_Release(unk); - CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER, NULL, &IID_IInternetProtocolInfo, (void**)&ret); return ret; }

1 0

wine/dlls/ddraw surface_main.c
by Alexandre Julliard Nov. 14, 2005

Nov. 14, 2005

ChangeSet ID: 21255 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/14 06:27:55 Modified files: dlls/ddraw : surface_main.c Log message: Lionel Ulmer <lionel.ulmer(a)free.fr> Use the front buffer palette for DC operations on off-screen buffers. Patch: http://cvs.winehq.org/patch.py?id=21255 Old revision New revision Changes Path 1.8 1.9 +25 -0 wine/dlls/ddraw/surface_main.c Index: wine/dlls/ddraw/surface_main.c diff -u -p wine/dlls/ddraw/surface_main.c:1.8 wine/dlls/ddraw/surface_main.c:1.9 --- wine/dlls/ddraw/surface_main.c:1.8 14 Nov 2005 12:27:55 -0000 +++ wine/dlls/ddraw/surface_main.c 14 Nov 2005 12:27:55 -0000 @@ -900,6 +900,31 @@ Main_DirectDrawSurface_GetDC(LPDIRECTDRA } hr = This->get_dc(This, &This->hDC); + + if ((This->surface_desc.u4.ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED8) && + (This->palette == NULL)) { + IDirectDrawImpl *ddraw = This->ddraw_owner; + IDirectDrawSurfaceImpl *surf; + + for (surf = ddraw->surfaces; surf != NULL; surf = surf->next_ddraw) { + if (((surf->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) == (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) && + (surf->palette != NULL)) { + RGBQUAD col[256]; + IDirectDrawPaletteImpl *pal = surf->palette; + unsigned int n; + for (n=0; n<256; n++) { + col[n].rgbRed = pal->palents[n].peRed; + col[n].rgbGreen = pal->palents[n].peGreen; + col[n].rgbBlue = pal->palents[n].peBlue; + col[n].rgbReserved = 0; + } + SetDIBColorTable(This->hDC, 0, 256, col); + break; + } + } + + } + if (SUCCEEDED(hr)) { TRACE("returning %p\n",This->hDC);

1 0

wine/dlls/advpack/tests advpack.c
by Alexandre Julliard Nov. 14, 2005

Nov. 14, 2005

ChangeSet ID: 21254 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/14 06:27:39 Modified files: dlls/advpack/tests: advpack.c Log message: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Get the version and language ID of ADVPACK.DLL too. Patch: http://cvs.winehq.org/patch.py?id=21254 Old revision New revision Changes Path 1.7 1.8 +15 -2 wine/dlls/advpack/tests/advpack.c Index: wine/dlls/advpack/tests/advpack.c diff -u -p wine/dlls/advpack/tests/advpack.c:1.7 wine/dlls/advpack/tests/advpack.c:1.8 --- wine/dlls/advpack/tests/advpack.c:1.7 14 Nov 2005 12:27:39 -0000 +++ wine/dlls/advpack/tests/advpack.c 14 Nov 2005 12:27:39 -0000 @@ -41,7 +41,6 @@ static void version_test(void) hr = pGetVersionFromFile("kernel32.dll", &major, &minor, FALSE); ok (hr == S_OK, "GetVersionFromFileEx(kernel32.dll) failed, returned " "0x%08lx\n", hr); - trace("kernel32.dll Language ID: 0x%08lx, Codepage ID: 0x%08lx\n", major, minor); @@ -49,9 +48,23 @@ static void version_test(void) hr = pGetVersionFromFile("kernel32.dll", &major, &minor, TRUE); ok (hr == S_OK, "GetVersionFromFileEx(kernel32.dll) failed, returned " "0x%08lx\n", hr); - trace("kernel32.dll version: %d.%d.%d.%d\n", HIWORD(major), LOWORD(major), HIWORD(minor), LOWORD(minor)); + + major = minor = 0; + hr = pGetVersionFromFile("advpack.dll", &major, &minor, FALSE); + ok (hr == S_OK, "GetVersionFromFileEx(advpack.dll) failed, returned " + "0x%08lx\n", hr); + trace("advpack.dll Language ID: 0x%08lx, Codepage ID: 0x%08lx\n", + major, minor); + + major = minor = 0; + hr = pGetVersionFromFile("advpack.dll", &major, &minor, TRUE); + todo_wine + ok (hr == S_OK, "GetVersionFromFileEx(advpack.dll) failed, returned " + "0x%08lx\n", hr); + trace("advpack.dll version: %d.%d.%d.%d\n", HIWORD(major), LOWORD(major), + HIWORD(minor), LOWORD(minor)); } static void delnode_test(void)

1 0

wine/dlls/ddraw surface_dib.c
by Alexandre Julliard Nov. 14, 2005

Nov. 14, 2005

ChangeSet ID: 21253 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/14 06:27:31 Modified files: dlls/ddraw : surface_dib.c Log message: H. Verbeet <hverbeet(a)gmail.com> Fix the default value for keylow in DIB_DirectDrawSurface_Blt. Unset DDBLT_DDFX when lpbltfx is NULL / contains no dwDDFX. Patch: http://cvs.winehq.org/patch.py?id=21253 Old revision New revision Changes Path 1.8 1.9 +3 -1 wine/dlls/ddraw/surface_dib.c Index: wine/dlls/ddraw/surface_dib.c diff -u -p wine/dlls/ddraw/surface_dib.c:1.8 wine/dlls/ddraw/surface_dib.c:1.9 --- wine/dlls/ddraw/surface_dib.c:1.8 14 Nov 2005 12:27:31 -0000 +++ wine/dlls/ddraw/surface_dib.c 14 Nov 2005 12:27:31 -0000 @@ -538,6 +538,8 @@ DIB_DirectDrawSurface_Blt(LPDIRECTDRAWSU IDirectDrawSurface7_Lock(iface,NULL,&ddesc,DDLOCK_WRITEONLY,0); } + if (!lpbltfx || !(lpbltfx->dwDDFX)) dwFlags &= ~DDBLT_DDFX; + if ((sdesc.u4.ddpfPixelFormat.dwFlags & DDPF_FOURCC) && (ddesc.u4.ddpfPixelFormat.dwFlags & DDPF_FOURCC)) { if (sdesc.u4.ddpfPixelFormat.dwFourCC != sdesc.u4.ddpfPixelFormat.dwFourCC) { @@ -831,7 +833,7 @@ DIB_DirectDrawSurface_Blt(LPDIRECTDRAWSU } } else { LONG dstyinc = ddesc.u1.lPitch, dstxinc = bpp; - DWORD keylow = 0, keyhigh = 0, keymask = 0xFFFFFFFF; + DWORD keylow = 0xFFFFFFFF, keyhigh = 0, keymask = 0xFFFFFFFF; if (dwFlags & (DDBLT_KEYSRC | DDBLT_KEYDEST | DDBLT_KEYSRCOVERRIDE | DDBLT_KEYDESTOVERRIDE)) { if (dwFlags & DDBLT_KEYSRC) {

1 0

wine/ programs/winemine/rsrc.rc programs/winef ...
by Alexandre Julliard Nov. 14, 2005

Nov. 14, 2005

ChangeSet ID: 21252 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/14 05:27:37 Modified files: programs/winemine: rsrc.rc programs/winefile: rsrc.rc programs/wineconsole: wineconsole_res.rc programs/winecfg: winecfg.rc programs/wcmd : wcmdrc.rc programs/view : viewrc.rc programs/uninstaller: rsrc.rc programs/taskmgr: taskmgr.rc programs/start : rsrc.rc programs/regedit: Ko.rc programs/notepad: rsrc.rc dlls/wldap32 : wldap32.rc dlls/winspool : winspool.rc dlls/shdocvw : shdocvw.rc dlls/serialui : serialui_rc.rc dlls/oledlg : rsrc.rc dlls/msi : msi.rc dlls/mshtml : rsrc.rc dlls/mpr : mpr.rc dlls/avifil32 : rsrc.rc Added files: programs/winemine: Ko.rc programs/winefile: Ko.rc programs/wineconsole: wineconsole_Ko.rc programs/winecfg: Ko.rc programs/wcmd : Ko.rc programs/view : Ko.rc programs/uninstaller: Ko.rc programs/taskmgr: Ko.rc programs/start : Ko.rc programs/notepad: Ko.rc dlls/wldap32 : wldap32_Ko.rc dlls/winspool : Ko.rc dlls/shdocvw : Ko.rc dlls/serialui : Ko.rc dlls/oledlg : oledlg_Ko.rc dlls/msi : msi_Ko.rc dlls/mshtml : Ko.rc dlls/mpr : mpr_Ko.rc dlls/avifil32 : avifile_Ko.rc Log message: YunSong Hwang <hys545(a)dreamwiz.com> Add Korean translations. Patch: http://cvs.winehq.org/patch.py?id=21252 Old revision New revision Changes Path 1.20 1.21 +1 -0 wine/programs/winemine/rsrc.rc Added 1.1 +0 -0 wine/programs/winemine/Ko.rc 1.15 1.16 +1 -0 wine/programs/winefile/rsrc.rc Added 1.1 +0 -0 wine/programs/winefile/Ko.rc 1.13 1.14 +1 -0 wine/programs/wineconsole/wineconsole_res.rc Added 1.1 +0 -0 wine/programs/wineconsole/wineconsole_Ko.rc 1.24 1.25 +1 -0 wine/programs/winecfg/winecfg.rc Added 1.1 +0 -0 wine/programs/winecfg/Ko.rc 1.20 1.21 +1 -0 wine/programs/wcmd/wcmdrc.rc Added 1.1 +0 -0 wine/programs/wcmd/Ko.rc 1.13 1.14 +1 -0 wine/programs/view/viewrc.rc Added 1.1 +0 -0 wine/programs/view/Ko.rc 1.18 1.19 +1 -0 wine/programs/uninstaller/rsrc.rc Added 1.1 +0 -0 wine/programs/uninstaller/Ko.rc 1.5 1.6 +1 -0 wine/programs/taskmgr/taskmgr.rc Added 1.1 +0 -0 wine/programs/taskmgr/Ko.rc 1.12 1.13 +1 -0 wine/programs/start/rsrc.rc Added 1.1 +0 -0 wine/programs/start/Ko.rc 1.1 1.2 +26 -8 wine/programs/regedit/Ko.rc 1.19 1.20 +1 -0 wine/programs/notepad/rsrc.rc Added 1.1 +0 -0 wine/programs/notepad/Ko.rc 1.6 1.7 +1 -0 wine/dlls/wldap32/wldap32.rc Added 1.1 +0 -0 wine/dlls/wldap32/wldap32_Ko.rc 1.5 1.6 +1 -0 wine/dlls/winspool/winspool.rc Added 1.1 +0 -0 wine/dlls/winspool/Ko.rc 1.9 1.10 +1 -0 wine/dlls/shdocvw/shdocvw.rc Added 1.1 +0 -0 wine/dlls/shdocvw/Ko.rc 1.15 1.16 +1 -0 wine/dlls/serialui/serialui_rc.rc Added 1.1 +0 -0 wine/dlls/serialui/Ko.rc 1.10 1.11 +1 -0 wine/dlls/oledlg/rsrc.rc Added 1.1 +0 -0 wine/dlls/oledlg/oledlg_Ko.rc 1.9 1.10 +1 -0 wine/dlls/msi/msi.rc Added 1.1 +0 -0 wine/dlls/msi/msi_Ko.rc 1.10 1.11 +1 -0 wine/dlls/mshtml/rsrc.rc Added 1.1 +0 -0 wine/dlls/mshtml/Ko.rc 1.13 1.14 +1 -0 wine/dlls/mpr/mpr.rc Added 1.1 +0 -0 wine/dlls/mpr/mpr_Ko.rc 1.16 1.17 +1 -0 wine/dlls/avifil32/rsrc.rc Added 1.1 +0 -0 wine/dlls/avifil32/avifile_Ko.rc

1 0

wine/dlls/iphlpapi iphlpapi_main.c
by Alexandre Julliard Nov. 14, 2005

Nov. 14, 2005

ChangeSet ID: 21251 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/14 05:24:37 Modified files: dlls/iphlpapi : iphlpapi_main.c Log message: Markus Amsler <markus.amsler(a)oribi.org> Add, reformat API documentation. Patch: http://cvs.winehq.org/patch.py?id=21251 Old revision New revision Changes Path 1.20 1.21 +381 -348 wine/dlls/iphlpapi/iphlpapi_main.c

1 0