May 2007 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : winedbg: Fix a problem revealed by compilation in 64-bit mode.
by Alexandre Julliard May 25, 2007

May 25, 2007

Module: wine Branch: master Commit: e0510e42fe588fb8079c0f378c471cc77cfa88f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0510e42fe588fb8079c0f378… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu May 24 17:15:59 2007 +0900 winedbg: Fix a problem revealed by compilation in 64-bit mode. --- programs/winedbg/be_x86_64.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 3400f72..75dc933 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -51,7 +51,7 @@ static unsigned be_x86_64_get_register_info(int regno, enum be_cpu_addr* kind) /* this is true when running in 32bit mode... and wrong in 64 :-/ */ switch (regno) { - case CV_AMD64_EIP: *kind = be_cpu_addr_pc; return TRUE; + case CV_AMD64_RIP: *kind = be_cpu_addr_pc; return TRUE; case CV_AMD64_EBP: *kind = be_cpu_addr_frame; return TRUE; case CV_AMD64_ESP: *kind = be_cpu_addr_stack; return TRUE; }

1 0

Dmitry Timoshkov : user32/tests: Fix a problem revealed by compilation in 64-bit mode.
by Alexandre Julliard May 25, 2007

May 25, 2007

Module: wine Branch: master Commit: 141673c22292406bbab0b2fe269f1e13592911eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=141673c22292406bbab0b2fe2… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu May 24 17:15:31 2007 +0900 user32/tests: Fix a problem revealed by compilation in 64-bit mode. --- dlls/user32/tests/win.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 632fcc1..9faca35 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -322,7 +322,7 @@ static void test_parent_owner(void) if (0) { /* this test succeeds on NT but crashes on win9x systems */ - ret = (HWND)SetWindowLongA( test, GWL_HWNDPARENT, (LONG_PTR)hwndMain2 ); + ret = (HWND)SetWindowLongPtrA( test, GWLP_HWNDPARENT, (LONG_PTR)hwndMain2 ); ok( !ret, "Set GWL_HWNDPARENT succeeded on desktop\n" ); check_parents( desktop, 0, 0, 0, 0, 0, 0 ); ok( !SetParent( desktop, hwndMain ), "SetParent succeeded on desktop\n" );

1 0

Dmitry Timoshkov : kernel32/tests: Fix a problem revealed by compilation in 64-bit mode.
by Alexandre Julliard May 25, 2007

May 25, 2007

Module: wine Branch: master Commit: c28ffeeb9a37131ac0a574b8fbeb78c411e99bc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c28ffeeb9a37131ac0a574b8f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu May 24 17:15:03 2007 +0900 kernel32/tests: Fix a problem revealed by compilation in 64-bit mode. --- dlls/kernel32/tests/loader.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 7b297a2..cb23299 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -40,8 +40,10 @@ static const struct static IMAGE_NT_HEADERS nt_header = { IMAGE_NT_SIGNATURE, /* Signature */ -#ifdef __i386__ +#if defined __i386__ { IMAGE_FILE_MACHINE_I386, /* Machine */ +#elif defined __x86_64__ + { IMAGE_FILE_MACHINE_AMD64, /* Machine */ #else # error You must specify the machine type #endif

1 0

Louis Lenders : shell32: Update Dutch resource.
by Alexandre Julliard May 25, 2007

May 25, 2007

Module: wine Branch: master Commit: 2d83063288f63f442981494f53c6b9c1e7fe72b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d83063288f63f442981494f5… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu May 24 08:35:26 2007 +0100 shell32: Update Dutch resource. --- dlls/shell32/shell32_Nl.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shell32_Nl.rc b/dlls/shell32/shell32_Nl.rc index bbc5186..17da1e4 100644 --- a/dlls/shell32/shell32_Nl.rc +++ b/dlls/shell32/shell32_Nl.rc @@ -37,10 +37,10 @@ CAPTION "" FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and Wine will open it for you.", 12289, 36, 11, 182, 18 - LTEXT "&Open:", 12305, 7, 39, 24, 10 + LTEXT "Geef de naam van een programma, map, document, of Internet-adres op. Wine zal het vervolgens openen.", 12289, 36, 11, 182, 18 + LTEXT "&Openen:", 12305, 7, 39, 28, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "&Browse...", 12288, 170, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "Annuleren", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "&Bladeren...", 12288, 170, 63, 50, 14, WS_TABSTOP }

1 0

Dmitry Timoshkov : comctl32/tests: Fix some problems revealed by compilation in 64-bit mode.
by Alexandre Julliard May 25, 2007

May 25, 2007

Module: wine Branch: master Commit: 6055d04f07c8ef026987b7bdfe7f83c0a69aed96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6055d04f07c8ef026987b7bdf… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu May 24 17:14:31 2007 +0900 comctl32/tests: Fix some problems revealed by compilation in 64-bit mode. --- dlls/comctl32/tests/datetime.c | 8 ++++---- dlls/comctl32/tests/header.c | 8 ++++---- dlls/comctl32/tests/listview.c | 28 ++++++++++++++-------------- dlls/comctl32/tests/monthcal.c | 8 ++++---- dlls/comctl32/tests/tab.c | 6 +++--- dlls/comctl32/tests/trackbar.c | 6 +++--- dlls/comctl32/tests/treeview.c | 17 +++++------------ dlls/comctl32/tests/updown.c | 16 ++++++++-------- 8 files changed, 45 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6055d04f07c8ef026987b…

1 0

Michael Stefaniuc : msi: A signed 1-bit bitfield doesn't make much sense; use unsigned.
by Alexandre Julliard May 25, 2007

May 25, 2007

Module: wine Branch: master Commit: 7043b7baa411901762459e4c214eb04120f63995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7043b7baa411901762459e4c2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 24 01:32:18 2007 +0200 msi: A signed 1-bit bitfield doesn't make much sense; use unsigned. --- dlls/msi/msipriv.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index a8d833f..bcb7512 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -300,9 +300,9 @@ typedef struct tagMSICOMPONENT LPWSTR FullKeypath; LPWSTR AdvertiseString; - int hasAdvertiseFeature:1; - int hasLocalFeature:1; - int hasSourceFeature:1; + unsigned int hasAdvertiseFeature:1; + unsigned int hasLocalFeature:1; + unsigned int hasSourceFeature:1; } MSICOMPONENT; typedef struct tagComponentList

1 0

Michael Stefaniuc : winedump: '$' isn' t a valid character in an identifier regardless that gcc accepts it without warning .
by Alexandre Julliard May 25, 2007

May 25, 2007

Module: wine Branch: master Commit: 192c46155e922dd9113e315ef7855b05da24aadc URL: http://source.winehq.org/git/wine.git/?a=commit;h=192c46155e922dd9113e315ef… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 23 23:34:01 2007 +0200 winedump: '$' isn't a valid character in an identifier regardless that gcc accepts it without warning. --- tools/winedump/lib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winedump/lib.c b/tools/winedump/lib.c index 155a6fa..85f305d 100644 --- a/tools/winedump/lib.c +++ b/tools/winedump/lib.c @@ -106,9 +106,9 @@ static void dump_long_import(const void *base, const IMAGE_SECTION_HEADER *ish, } else if (globals.do_debug && !strcmp((const char *)ish[i].Name, ".debug$S")) { - const char *imp_debug$ = (const char *)base + ish[i].PointerToRawData; + const char *imp_debugS = (const char *)base + ish[i].PointerToRawData; - codeview_dump_symbols(imp_debug$, ish[i].SizeOfRawData); + codeview_dump_symbols(imp_debugS, ish[i].SizeOfRawData); printf("\n"); } }

1 0

Rob Shearman : mlang: Implement ConvertINetString.
by Alexandre Julliard May 25, 2007

May 25, 2007

Module: wine Branch: master Commit: f21e9c2aa89a12db3dda5493556fd2195b6f1468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f21e9c2aa89a12db3dda54935… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed May 23 19:12:59 2007 +0100 mlang: Implement ConvertINetString. --- dlls/mlang/mlang.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 8133744..6d5142b 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -601,9 +601,46 @@ HRESULT WINAPI ConvertINetString( LPINT pcDstSize ) { - FIXME("%p %d %d %s %p %p %p: stub!\n", pdwMode, dwSrcEncoding, dwDstEncoding, + TRACE("%p %d %d %s %p %p %p\n", pdwMode, dwSrcEncoding, dwDstEncoding, debugstr_a(pSrcStr), pcSrcSize, pDstStr, pcDstSize); - return E_NOTIMPL; + + if (dwSrcEncoding == CP_UNICODE) + { + INT cSrcSizeW; + if (pcSrcSize && *pcSrcSize != -1) + { + cSrcSizeW = *pcSrcSize / sizeof(WCHAR); + pcSrcSize = &cSrcSizeW; + } + return ConvertINetUnicodeToMultiByte(pdwMode, dwDstEncoding, (LPCWSTR)pSrcStr, pcSrcSize, pDstStr, pcDstSize); + } + else if (dwDstEncoding == CP_UNICODE) + { + HRESULT hr = ConvertINetMultiByteToUnicode(pdwMode, dwSrcEncoding, pSrcStr, pcSrcSize, (LPWSTR)pDstStr, pcDstSize); + *pcDstSize *= sizeof(WCHAR); + return hr; + } + else + { + INT cDstSizeW; + LPWSTR pDstStrW; + HRESULT hr; + + TRACE("convert %s from %d to %d\n", debugstr_a(pSrcStr), dwSrcEncoding, dwDstEncoding); + + hr = ConvertINetMultiByteToUnicode(pdwMode, dwSrcEncoding, pSrcStr, pcSrcSize, NULL, &cDstSizeW); + if (hr != S_OK) + return hr; + + pDstStrW = HeapAlloc(GetProcessHeap(), 0, cDstSizeW * sizeof(WCHAR)); + hr = ConvertINetMultiByteToUnicode(pdwMode, dwSrcEncoding, pSrcStr, pcSrcSize, pDstStrW, &cDstSizeW); + if (hr != S_OK) + return hr; + + hr = ConvertINetUnicodeToMultiByte(pdwMode, dwDstEncoding, pDstStrW, &cDstSizeW, pDstStr, pcDstSize); + HeapFree(GetProcessHeap(), 0, pDstStrW); + return hr; + } } static HRESULT GetFamilyCodePage(

1 0

Rob Shearman : urlmon: The persisted version of URL monikers should be size of URL
by Alexandre Julliard May 25, 2007

May 25, 2007

Module: wine Branch: master Commit: d82c456e5f94fcdb07040eedd2bec04bffddbd1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82c456e5f94fcdb07040eedd… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed May 23 19:05:24 2007 +0100 urlmon: The persisted version of URL monikers should be size of URL including nul-terminating character (4-bytes), followed by the URL string including nul-terminating character. --- dlls/urlmon/umon.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 0f86b83..5c795f0 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -410,23 +410,23 @@ static HRESULT WINAPI URLMonikerImpl_Load(IMoniker* iface,IStream* pStm) URLMonikerImpl *This = (URLMonikerImpl *)iface; HRESULT res; - ULONG len; + ULONG size; ULONG got; TRACE("(%p,%p)\n",This,pStm); if(!pStm) return E_INVALIDARG; - res = IStream_Read(pStm, &len, sizeof(ULONG), &got); + res = IStream_Read(pStm, &size, sizeof(ULONG), &got); if(SUCCEEDED(res)) { if(got == sizeof(ULONG)) { HeapFree(GetProcessHeap(), 0, This->URLName); - This->URLName=HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*(len+1)); + This->URLName=HeapAlloc(GetProcessHeap(),0,size); if(!This->URLName) res = E_OUTOFMEMORY; else { - res = IStream_Read(pStm, This->URLName, len, NULL); - This->URLName[len] = 0; + res = IStream_Read(pStm, This->URLName, size, NULL); + This->URLName[size/sizeof(WCHAR) - 1] = 0; } } else @@ -445,16 +445,16 @@ static HRESULT WINAPI URLMonikerImpl_Save(IMoniker* iface, URLMonikerImpl *This = (URLMonikerImpl *)iface; HRESULT res; - ULONG len; + ULONG size; TRACE("(%p,%p,%d)\n",This,pStm,fClearDirty); if(!pStm) return E_INVALIDARG; - len = strlenW(This->URLName); - res=IStream_Write(pStm,&len,sizeof(ULONG),NULL); + size = (strlenW(This->URLName) + 1)*sizeof(WCHAR); + res=IStream_Write(pStm,&size,sizeof(ULONG),NULL); if(SUCCEEDED(res)) - res=IStream_Write(pStm,This->URLName,len*sizeof(WCHAR),NULL); + res=IStream_Write(pStm,This->URLName,size,NULL); return res; } @@ -472,8 +472,7 @@ static HRESULT WINAPI URLMonikerImpl_GetSizeMax(IMoniker* iface, if(!pcbSize) return E_INVALIDARG; - pcbSize->u.LowPart = sizeof(ULONG) + (strlenW(This->URLName) * sizeof(WCHAR)); - pcbSize->u.HighPart = 0; + pcbSize->QuadPart = sizeof(ULONG) + ((strlenW(This->URLName)+1) * sizeof(WCHAR)); return S_OK; }

1 0

Rob Shearman : urlmon: Fix a typo in URLMonikerImpl_Save.
by Alexandre Julliard May 25, 2007

May 25, 2007

Module: wine Branch: master Commit: d76a15a36dc411c3809091f227e6c4719b17edba URL: http://source.winehq.org/git/wine.git/?a=commit;h=d76a15a36dc411c3809091f22… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed May 23 19:04:49 2007 +0100 urlmon: Fix a typo in URLMonikerImpl_Save. The data in This->URLName should be written out, not the pointer followed by garbage. --- dlls/urlmon/umon.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 7765f27..0f86b83 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -454,7 +454,7 @@ static HRESULT WINAPI URLMonikerImpl_Save(IMoniker* iface, len = strlenW(This->URLName); res=IStream_Write(pStm,&len,sizeof(ULONG),NULL); if(SUCCEEDED(res)) - res=IStream_Write(pStm,&This->URLName,len*sizeof(WCHAR),NULL); + res=IStream_Write(pStm,This->URLName,len*sizeof(WCHAR),NULL); return res; }

1 0