January 2008 - Wine-commits

Reece H. Dunn : gdi32: Vista returns UNICODE_NOCHAR if a character does not exist.
by Alexandre Julliard 25 Jan '08

25 Jan '08

Module: wine Branch: master Commit: e3a5167ffe9cf6cb8e673a62af5a162109caf6d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3a5167ffe9cf6cb8e673a62a… Author: Reece H. Dunn <msclrhd(a)gmail.com> Date: Thu Jan 24 08:57:29 2008 +0000 gdi32: Vista returns UNICODE_NOCHAR if a character does not exist. --- dlls/gdi32/tests/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 08725de..7e560d2 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -604,7 +604,7 @@ static void test_GetGlyphIndices(void) flags |= GGI_MARK_NONEXISTING_GLYPHS; charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %d\n", charcount); - ok(glyphs[4] == 0x001f, "GetGlyphIndices should have returned a nonexistent char not %04x\n", glyphs[4]); + ok((glyphs[4] == 0x001f || glyphs[4] == UNICODE_NOCHAR /* Vista */), "GetGlyphIndices should have returned a nonexistent char not %04x\n", glyphs[4]); flags = 0; charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %d\n", charcount);

1 0

Reece H. Dunn : advapi32: Fix some cred test failures on Vista and prevent it crashing.
by Alexandre Julliard 25 Jan '08

25 Jan '08

Module: wine Branch: master Commit: d4c48db4b00b84e49bbb8cb6f5b5d2e69bb116aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4c48db4b00b84e49bbb8cb6f… Author: Reece H. Dunn <msclrhd(a)gmail.com> Date: Fri Jan 25 00:23:00 2008 +0000 advapi32: Fix some cred test failures on Vista and prevent it crashing. --- dlls/advapi32/tests/cred.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index 24db015..2fbd1c7 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -50,8 +50,8 @@ static void test_CredReadA(void) SetLastError(0xdeadbeef); ret = pCredReadA(TEST_TARGET_NAME, CRED_TYPE_GENERIC, 0xdeadbeef, &cred); - ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, - "CredReadA should have failed with ERROR_INVALID_FLAGS instead of %d\n", + ok(!ret && ( GetLastError() == ERROR_INVALID_FLAGS || GetLastError() == ERROR_INVALID_PARAMETER ), + "CredReadA should have failed with ERROR_INVALID_FLAGS or ERROR_INVALID_PARAMETER instead of %d\n", GetLastError()); SetLastError(0xdeadbeef); @@ -95,8 +95,8 @@ static void test_CredWriteA(void) SetLastError(0xdeadbeef); ret = pCredWriteA(&new_cred, 0); - ok(!ret && GetLastError() == ERROR_BAD_USERNAME, - "CredWrite with username without domain should return ERROR_BAD_USERNAME not %d\n", GetLastError()); + ok(!ret && ( GetLastError() == ERROR_BAD_USERNAME || GetLastError() == ERROR_NO_SUCH_LOGON_SESSION /* Vista */ ), + "CredWrite with username without domain should return ERROR_BAD_USERNAME or ERROR_NO_SUCH_LOGON_SESSION not %d\n", GetLastError()); new_cred.UserName = NULL; SetLastError(0xdeadbeef); @@ -118,8 +118,8 @@ static void test_CredDeleteA(void) SetLastError(0xdeadbeef); ret = pCredDeleteA(TEST_TARGET_NAME, CRED_TYPE_GENERIC, 0xdeadbeef); - ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, - "CredDeleteA should have failed with ERROR_INVALID_FLAGS instead of %d\n", + ok(!ret && ( GetLastError() == ERROR_INVALID_FLAGS || GetLastError() == ERROR_INVALID_PARAMETER /* Vista */ ), + "CredDeleteA should have failed with ERROR_INVALID_FLAGS or ERROR_INVALID_PARAMETER instead of %d\n", GetLastError()); } @@ -226,11 +226,14 @@ static void test_domain_password(void) ret = pCredReadA(TEST_TARGET_NAME, CRED_TYPE_DOMAIN_PASSWORD, 0, &cred); ok(ret, "CredReadA failed with error %d\n", GetLastError()); - todo_wine - ok(cred->CredentialBlobSize == 0, "expected CredentialBlobSize of 0 but got %d\n", cred->CredentialBlobSize); - todo_wine - ok(!cred->CredentialBlob, "expected NULL credentials but got %p\n", cred->CredentialBlob); - pCredFree(cred); + if (ret) /* don't check the values of cred, if CredReadA failed. */ + { + todo_wine + ok(cred->CredentialBlobSize == 0, "expected CredentialBlobSize of 0 but got %d\n", cred->CredentialBlobSize); + todo_wine + ok(!cred->CredentialBlob, "expected NULL credentials but got %p\n", cred->CredentialBlob); + pCredFree(cred); + } ret = pCredDeleteA(TEST_TARGET_NAME, CRED_TYPE_DOMAIN_PASSWORD, 0); ok(ret, "CredDeleteA failed with error %d\n", GetLastError());

1 0

Ken Thomases : winex11.drv: Accomodate XGetWindowProperty returning an actual format of something other than 32 for the TARGETS property .
by Alexandre Julliard 25 Jan '08

25 Jan '08

Module: wine Branch: master Commit: a30327afef7b08d1aac1943ded64ee363a61c537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a30327afef7b08d1aac1943de… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jan 25 12:20:39 2008 +0000 winex11.drv: Accomodate XGetWindowProperty returning an actual format of something other than 32 for the TARGETS property. We shouldn't care what format the property was set with, as long as we trust that the property is an atom type. --- dlls/winex11.drv/clipboard.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 7731ae0..453746f 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1903,8 +1903,8 @@ static int X11DRV_CLIPBOARD_QueryAvailableData(LPCLIPBOARDINFO lpcbinfo) * The TARGETS property should have returned us a list of atoms * corresponding to each selection target format supported. */ - if ((atype == XA_ATOM || atype == x11drv_atom(TARGETS)) && aformat == 32) - X11DRV_CLIPBOARD_InsertSelectionProperties(display, targetList, cSelectionTargets); + if (atype == XA_ATOM || atype == x11drv_atom(TARGETS)) + X11DRV_CLIPBOARD_InsertSelectionProperties(display, targetList, (cSelectionTargets * aformat / (8 * sizeof(Atom)))); /* Free the list of targets */ wine_tsx11_lock();

1 0

Rob Shearman : ntdsapi: Add tests for DsMakeSpnW.
by Alexandre Julliard 25 Jan '08

25 Jan '08

Module: wine Branch: master Commit: 5db45041c66a5073566bb8bcbc695ad3ece2d5f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5db45041c66a5073566bb8bcb… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 24 18:36:36 2008 +0000 ntdsapi: Add tests for DsMakeSpnW. --- .gitignore | 4 ++ Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 1 + dlls/ntdsapi/tests/Makefile.in | 13 +++++ dlls/ntdsapi/tests/ntdsapi.c | 109 ++++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 + programs/winetest/winetest.rc | 1 + 9 files changed, 137 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5db45041c66a5073566bb…

1 0

Rob Shearman : ntdsapi: Implement DsMakeSpnW.
by Alexandre Julliard 25 Jan '08

25 Jan '08

Module: wine Branch: master Commit: dbcac92819ef905d4bb5d44cbd8ea2542c64da2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbcac92819ef905d4bb5d44cb… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 24 18:37:10 2008 +0000 ntdsapi: Implement DsMakeSpnW. --- dlls/ntdsapi/Makefile.in | 2 +- dlls/ntdsapi/ntdsapi.c | 80 ++++++++++++++++++++++++++++++++++++++++- dlls/ntdsapi/tests/ntdsapi.c | 12 ------ 3 files changed, 79 insertions(+), 15 deletions(-) diff --git a/dlls/ntdsapi/Makefile.in b/dlls/ntdsapi/Makefile.in index 0d9e955..2649a36 100644 --- a/dlls/ntdsapi/Makefile.in +++ b/dlls/ntdsapi/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = ntdsapi.dll IMPORTLIB = libntdsapi.$(IMPLIBEXT) -IMPORTS = kernel32 +IMPORTS = user32 kernel32 C_SRCS = \ ntdsapi.c diff --git a/dlls/ntdsapi/ntdsapi.c b/dlls/ntdsapi/ntdsapi.c index f8fd98c..bad284c 100644 --- a/dlls/ntdsapi/ntdsapi.c +++ b/dlls/ntdsapi/ntdsapi.c @@ -21,8 +21,10 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "winuser.h" #include "ntdsapi.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdsapi); @@ -52,11 +54,85 @@ DWORD WINAPI DsMakeSpnW(LPCWSTR svc_class, LPCWSTR svc_name, LPCWSTR inst_name, USHORT inst_port, LPCWSTR ref, DWORD *spn_length, LPWSTR spn) { - FIXME("(%s,%s,%s,%d,%s,%p,%p): stub!\n", debugstr_w(svc_class), + DWORD new_spn_length; + INT len; + LPWSTR p; + + TRACE("(%s,%s,%s,%d,%s,%p,%p)\n", debugstr_w(svc_class), debugstr_w(svc_name), debugstr_w(inst_name), inst_port, debugstr_w(ref), spn_length, spn); - return ERROR_CALL_NOT_IMPLEMENTED; + if (!svc_class || !svc_name) + return ERROR_INVALID_PARAMETER; + + new_spn_length = strlenW(svc_class) + 1 /* for '/' */ + 1 /* for terminating '\0' */; + if (inst_name) + new_spn_length += strlenW(inst_name); + else + new_spn_length += strlenW(svc_name); + if (inst_port) + { + USHORT n = inst_port; + new_spn_length += 1 /* for ':' */; + do + { + n /= 10; + new_spn_length++; + } while (n != 0); + } + if (inst_name) + new_spn_length += 1 /* for '/' */ + strlenW(svc_name); + + if (*spn_length < new_spn_length) + { + *spn_length = new_spn_length; + return ERROR_BUFFER_OVERFLOW; + } + *spn_length = new_spn_length; + + p = spn; + len = strlenW(svc_class); + memcpy(p, svc_class, len * sizeof(WCHAR)); + p += len; + *p = '/'; + p++; + if (inst_name) + { + len = strlenW(inst_name); + memcpy(p, inst_name, len * sizeof(WCHAR)); + p += len; + *p = '\0'; + } + else + { + len = strlenW(svc_name); + memcpy(p, svc_name, len * sizeof(WCHAR)); + p += len; + *p = '\0'; + } + + if (inst_port) + { + static const WCHAR percentU[] = {'%','u',0}; + *p = ':'; + p++; + wsprintfW(p, percentU, inst_port); + p += strlenW(p); + } + + if (inst_name) + { + *p = '/'; + p++; + len = strlenW(svc_name); + memcpy(p, svc_name, len * sizeof(WCHAR)); + p += len; + *p = '\0'; + } + + TRACE("spn = %s\n", debugstr_w(spn)); + + return ERROR_SUCCESS; } DWORD WINAPI DsMakeSpnA(LPCSTR svc_class, LPCSTR svc_name, diff --git a/dlls/ntdsapi/tests/ntdsapi.c b/dlls/ntdsapi/tests/ntdsapi.c index 70cbe3e..ac5dd19 100644 --- a/dlls/ntdsapi/tests/ntdsapi.c +++ b/dlls/ntdsapi/tests/ntdsapi.c @@ -54,53 +54,41 @@ static void test_DsMakeSpn(void) spn_length = sizeof(spn)/sizeof(spn[0]); ret = DsMakeSpnW(NULL, NULL, NULL, 0, NULL, &spn_length, spn); - todo_wine ok(ret == ERROR_INVALID_PARAMETER, "DsMakeSpnW should have failed with ERROR_INVALID_PARAMETER instead of %d\n", ret); spn_length = sizeof(spn)/sizeof(spn[0]); ret = DsMakeSpnW(NULL, wszServiceHost, NULL, 0, NULL, &spn_length, spn); - todo_wine ok(ret == ERROR_INVALID_PARAMETER, "DsMakeSpnW should have failed with ERROR_INVALID_PARAMETER instead of %d\n", ret); spn_length = sizeof(spn)/sizeof(spn[0]); ret = DsMakeSpnW(wszServiceClass, wszServiceHost, NULL, 0, NULL, &spn_length, spn); - todo_wine { ok(ret == ERROR_SUCCESS, "DsMakeSpnW should have succeeded instead of failing with %d\n", ret); ok(!lstrcmpW(spn, wszSpn1), "DsMakeSpnW returned unexpected SPN %s\n", wine_dbgstr_w(spn)); ok(spn_length == lstrlenW(wszSpn1) + 1, "DsMakeSpnW should have returned spn_length of %d instead of %d\n", lstrlenW(wszSpn1) + 1, spn_length); - } spn_length = sizeof(spn)/sizeof(spn[0]); ret = DsMakeSpnW(wszServiceClass, wszServiceHost, wszInstanceName, 0, NULL, &spn_length, spn); - todo_wine { ok(ret == ERROR_SUCCESS, "DsMakeSpnW should have succeeded instead of failing with %d\n", ret); ok(!lstrcmpW(spn, wszSpn2), "DsMakeSpnW returned unexpected SPN %s\n", wine_dbgstr_w(spn)); ok(spn_length == lstrlenW(wszSpn2) + 1, "DsMakeSpnW should have returned spn_length of %d instead of %d\n", lstrlenW(wszSpn2) + 1, spn_length); - } spn_length = sizeof(spn)/sizeof(spn[0]); ret = DsMakeSpnW(wszServiceClass, wszServiceHost, wszInstanceName, 555, NULL, &spn_length, spn); - todo_wine { ok(ret == ERROR_SUCCESS, "DsMakeSpnW should have succeeded instead of failing with %d\n", ret); ok(!lstrcmpW(spn, wszSpn3), "DsMakeSpnW returned unexpected SPN %s\n", wine_dbgstr_w(spn)); ok(spn_length == lstrlenW(wszSpn3) + 1, "DsMakeSpnW should have returned spn_length of %d instead of %d\n", lstrlenW(wszSpn3) + 1, spn_length); - } spn_length = sizeof(spn)/sizeof(spn[0]); ret = DsMakeSpnW(wszServiceClass, wszServiceHost, wszInstanceName, 555, wszReferrer, &spn_length, spn); - todo_wine { ok(ret == ERROR_SUCCESS, "DsMakeSpnW should have succeeded instead of failing with %d\n", ret); ok(!lstrcmpW(spn, wszSpn4), "DsMakeSpnW returned unexpected SPN %s\n", wine_dbgstr_w(spn)); ok(spn_length == lstrlenW(wszSpn4) + 1, "DsMakeSpnW should have returned spn_length of %d instead of %d\n", lstrlenW(wszSpn4) + 1, spn_length); - } spn_length = sizeof(spn)/sizeof(spn[0]); ret = DsMakeSpnW(wszServiceClass, wszServiceHost, NULL, 555, wszReferrer, &spn_length, spn); - todo_wine { ok(ret == ERROR_SUCCESS, "DsMakeSpnW should have succeeded instead of failing with %d\n", ret); ok(!lstrcmpW(spn, wszSpn5), "DsMakeSpnW returned unexpected SPN %s\n", wine_dbgstr_w(spn)); ok(spn_length == lstrlenW(wszSpn5) + 1, "DsMakeSpnW should have returned spn_length of %d instead of %d\n", lstrlenW(wszSpn5) + 1, spn_length); - } } START_TEST( ntdsapi )

1 0

Rob Shearman : wininet: Pass the server name into InitializeSecurityContextW.
by Alexandre Julliard 25 Jan '08

25 Jan '08

Module: wine Branch: master Commit: 5edcf3ab6c333a1a5046651080a3bd67bb2b8dc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5edcf3ab6c333a1a504665108… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 24 19:30:11 2008 +0000 wininet: Pass the server name into InitializeSecurityContextW. --- dlls/wininet/http.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 50d61da..16e1ec7 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -561,7 +561,8 @@ static BOOL HTTP_DoAuthorization( LPWININETHTTPREQW lpwhr, LPCWSTR pszAuthValue, out_desc.pBuffers = &out; sec_status = InitializeSecurityContextW(first ? &pAuthInfo->cred : NULL, - first ? NULL : &pAuthInfo->ctx, NULL, + first ? NULL : &pAuthInfo->ctx, + first ? lpwhr->lpHttpSession->lpszServerName : NULL, context_req, 0, SECURITY_NETWORK_DREP, in.pvBuffer ? &in_desc : NULL, 0, &pAuthInfo->ctx, &out_desc,

1 0

Andrew Talbot : winedos: Remove unneeded casts.
by Alexandre Julliard 25 Jan '08

25 Jan '08

Module: wine Branch: master Commit: 84b935661843d94e383ae32e11e26ae78d2b967b URL: http://source.winehq.org/git/wine.git/?a=commit;h=84b935661843d94e383ae32e1… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jan 24 21:41:43 2008 +0000 winedos: Remove unneeded casts. --- dlls/winedos/devices.c | 4 ++-- dlls/winedos/dosmem.c | 2 +- dlls/winedos/int21.c | 6 +++--- dlls/winedos/int2f.c | 8 +++----- dlls/winedos/ioports.c | 2 +- dlls/winedos/vga.c | 2 +- dlls/winedos/vxd.c | 2 +- 7 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/winedos/devices.c b/dlls/winedos/devices.c index 368f8e5..49d84d3 100644 --- a/dlls/winedos/devices.c +++ b/dlls/winedos/devices.c @@ -145,8 +145,8 @@ static REQUEST_HEADER * get_hdr(int id, void**extra) { void **hdr_ptr = strategy_data[id]; if (extra) - *extra = hdr_ptr ? (void*)(hdr_ptr+1) : (void *)NULL; - return hdr_ptr ? *hdr_ptr : (void *)NULL; + *extra = hdr_ptr ? (void*)(hdr_ptr+1) : NULL; + return hdr_ptr ? *hdr_ptr : NULL; } static void WINAPI nul_strategy(CONTEXT86*ctx) diff --git a/dlls/winedos/dosmem.c b/dlls/winedos/dosmem.c index 3f635c7..9829f1a 100644 --- a/dlls/winedos/dosmem.c +++ b/dlls/winedos/dosmem.c @@ -300,7 +300,7 @@ LPVOID DOSMEM_AllocBlock(UINT size, UINT16* pseg) } /* curr is the found block */ curr->psp = psp; - if( pseg ) *pseg = (((char*)curr) + 16 - (char*)DOSMEM_dosmem) >> 4; + if( pseg ) *pseg = (((char*)curr) + 16 - DOSMEM_dosmem) >> 4; return (LPVOID) ((char*)curr + 16); } } diff --git a/dlls/winedos/int21.c b/dlls/winedos/int21.c index 75aeb1c..ac99714 100644 --- a/dlls/winedos/int21.c +++ b/dlls/winedos/int21.c @@ -1720,7 +1720,7 @@ static void INT21_RandomBlockReadFromFCB( CONTEXT86 *context ) } else { disk_transfer_area = INT21_GetCurrentDTA(context); records_requested = CX_reg(context); - bytes_requested = (UINT) records_requested * fcb->logical_record_size; + bytes_requested = records_requested * fcb->logical_record_size; bytes_read = _lread((HFILE) handle, disk_transfer_area, bytes_requested); if (bytes_read != bytes_requested) { TRACE("_lread(%d, %p, %d) failed with %d\n", @@ -1811,7 +1811,7 @@ static void INT21_RandomBlockWriteToFCB( CONTEXT86 *context ) } else { disk_transfer_area = INT21_GetCurrentDTA(context); records_requested = CX_reg(context); - bytes_requested = (UINT) records_requested * fcb->logical_record_size; + bytes_requested = records_requested * fcb->logical_record_size; bytes_written = _lwrite((HFILE) handle, (LPCSTR)disk_transfer_area, bytes_requested); if (bytes_written != bytes_requested) { TRACE("_lwrite(%d, %p, %d) failed with %d\n", @@ -5006,7 +5006,7 @@ void WINAPI DOSVM_Int21Handler( CONTEXT86 *context ) } else { - LPVOID address = (void*)((DWORD)context->SegEs << 4); + LPVOID address = (void*)(context->SegEs << 4); UINT blocksize = DOSMEM_ResizeBlock( address, newsize, FALSE ); RESET_CFLAG(context); diff --git a/dlls/winedos/int2f.c b/dlls/winedos/int2f.c index 7bbf5e4..c5b620f 100644 --- a/dlls/winedos/int2f.c +++ b/dlls/winedos/int2f.c @@ -556,7 +556,7 @@ static void MSCDEX_Request(BYTE *driver_request, BOOL dorealmode) * the following tests are wrong because lots of functions don't require the * tray to be closed with a CD inside */ - TRACE("CDROM device driver -> command <%d>\n", (unsigned char)driver_request[2]); + TRACE("CDROM device driver -> command <%d>\n", driver_request[2]); MSCDEX_Dump("Beg", driver_request, dorealmode); @@ -846,8 +846,7 @@ static void MSCDEX_Request(BYTE *driver_request, BOOL dorealmode) at = PTR_AT(driver_request, 20, DWORD); - TRACE(" --> SEEK AUDIO mode :<0x%02X>, [%d]\n", - (BYTE)driver_request[13], at); + TRACE(" --> SEEK AUDIO mode :<0x%02X>, [%d]\n", driver_request[13], at); switch (driver_request[13]) { case 1: /* Red book addressing mode = 0:m:s:f */ @@ -881,8 +880,7 @@ static void MSCDEX_Request(BYTE *driver_request, BOOL dorealmode) beg = end = PTR_AT(driver_request, 14, DWORD); end += PTR_AT(driver_request, 18, DWORD); - TRACE(" --> PLAY AUDIO mode :<0x%02X>, [%d-%d]\n", - (BYTE)driver_request[13], beg, end); + TRACE(" --> PLAY AUDIO mode :<0x%02X>, [%d-%d]\n", driver_request[13], beg, end); switch (driver_request[13]) { case 1: diff --git a/dlls/winedos/ioports.c b/dlls/winedos/ioports.c index 13079a7..e9f4f7f 100644 --- a/dlls/winedos/ioports.c +++ b/dlls/winedos/ioports.c @@ -608,7 +608,7 @@ void WINAPI DOSVM_outport( int port, int size, DWORD value ) break; case 0x61: parport_8255[1] = (BYTE)value; - if ((((BYTE)parport_8255[1] & 3) == 3) && (tmr_8253[2].countmax != 1)) + if (((parport_8255[1] & 3) == 3) && (tmr_8253[2].countmax != 1)) { TRACE("Beep (freq: %d) !\n", 1193180 / tmr_8253[2].countmax); Beep(1193180 / tmr_8253[2].countmax, 20); diff --git a/dlls/winedos/vga.c b/dlls/winedos/vga.c index 2a07f21..d236591 100644 --- a/dlls/winedos/vga.c +++ b/dlls/winedos/vga.c @@ -553,7 +553,7 @@ char VGA_GetColor16(int reg) { if (!lpddraw) return 0; - return (char)vga_16_palette[reg]; + return vga_16_palette[reg]; } /* set all 17 [char wide] colors at once in 16 color mode. */ diff --git a/dlls/winedos/vxd.c b/dlls/winedos/vxd.c index 4a1eabf..0b3602a 100644 --- a/dlls/winedos/vxd.c +++ b/dlls/winedos/vxd.c @@ -875,7 +875,7 @@ void WINAPI VXD_Win32s( CONTEXT86 *context ) * Output: EAX: 1 if OK */ - TRACE("UnMapModule: %x\n", (DWORD)W32S_APP2WINE(context->Edx)); + TRACE("UnMapModule: %x\n", W32S_APP2WINE(context->Edx)); /* As we didn't map anything, there's nothing to unmap ... */

1 0

Dmitry Timoshkov : shell32: Add a LogoffWindowsDialog stub.
by Alexandre Julliard 25 Jan '08

25 Jan '08

Module: wine Branch: master Commit: 7e8e807845a92a70b1a99b6627f66aa02559a8f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e8e807845a92a70b1a99b662… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Jan 25 17:13:01 2008 +0800 shell32: Add a LogoffWindowsDialog stub. --- dlls/shell32/shell32.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 044f443..6c0d7d8 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -49,6 +49,7 @@ 51 stdcall PathResolve(str long long) PathResolveAW 52 stdcall -noname PathGetArgs(str) PathGetArgsAW 53 stdcall DoEnvironmentSubst(long long) DoEnvironmentSubstAW + 54 stub LogoffWindowsDialog 55 stdcall -noname PathQuoteSpaces(ptr) PathQuoteSpacesAW 56 stdcall -noname PathUnquoteSpaces(str) PathUnquoteSpacesAW 57 stdcall -noname PathGetDriveNumber(str) PathGetDriveNumberAW

1 0

Alexander Nicolaysen Sørnes : winecfg: Update Norwegian Bokmål resource.
by Alexandre Julliard 25 Jan '08

25 Jan '08

Module: wine Branch: master Commit: be82868adb1763cbfb2ed7502b919aa0098f5382 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be82868adb1763cbfb2ed7502… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jan 24 14:54:21 2008 +0100 winecfg: Update Norwegian Bokmål resource. --- programs/winecfg/No.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index d6e7cf7..2f3bd09 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -219,7 +219,7 @@ BEGIN IDS_TAB_AUDIO "Lyd" IDS_TAB_ABOUT "Om" IDS_WINECFG_TITLE "Oppsett av Wine" - IDS_WINECFG_TITLE_APP "Wine configuration for %s" + IDS_WINECFG_TITLE_APP "Oppsett av Wine for �%s�" IDS_THEMEFILE "Temafiler" IDS_THEMEFILE_SELECT "Velg en temafil" IDS_AUDIO_MISSING "Ingen lyddriver er oppgitt i registeret.\n\nEn anbefalt driver er valgt for deg;\nbruk den eller velg en annen,\n\nog trykk �Bruk� for at endringene skal tre i kraft."

1 0

Hans Leidekker : mscms: Use NT directory for storing color profiles.
by Alexandre Julliard 25 Jan '08

25 Jan '08

Module: wine Branch: master Commit: 72ba2be6c49e0d84ee6db68b6b9611a2e3cc1c79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72ba2be6c49e0d84ee6db68b6… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Jan 24 20:02:53 2008 +0100 mscms: Use NT directory for storing color profiles. --- dlls/mscms/profile.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 4ecb361..11413f1 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -119,7 +119,8 @@ BOOL WINAPI GetColorDirectoryA( PCSTR machine, PSTR buffer, PDWORD size ) BOOL WINAPI GetColorDirectoryW( PCWSTR machine, PWSTR buffer, PDWORD size ) { WCHAR colordir[MAX_PATH]; - static const WCHAR colorsubdir[] = { '\\','c','o','l','o','r',0 }; + static const WCHAR colorsubdir[] = + {'\\','s','p','o','o','l','\\','d','r','i','v','e','r','s','\\','c','o','l','o','r',0}; DWORD len; TRACE( "( %p, %p )\n", buffer, size );

1 0