January 2009 - Wine-Commits

Alexandre Julliard : user32/tests: Fix various failures in the monitor test .
by Alexandre Julliard Jan. 26, 2009

Jan. 26, 2009

Module: wine Branch: master Commit: 4bec383d9f0b462ca930834e0ec4ee7efe3b95c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bec383d9f0b462ca930834e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 25 17:28:39 2009 +0100 user32/tests: Fix various failures in the monitor test. --- dlls/user32/tests/monitor.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 3d03596..25c8867 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -240,7 +240,7 @@ static void test_ChangeDisplaySettingsEx(void) dm.dmFields = vid_modes_test[i].fields; res = pChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); ok(vid_modes_test[i].must_succeed ? - (res == DISP_CHANGE_SUCCESSFUL) : + (res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_RESTART) : (res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_BADMODE || res == DISP_CHANGE_BADPARAM), "Unexpected ChangeDisplaySettingsEx() return code for resolution[%d]: %d\n", i, res); @@ -257,7 +257,7 @@ static void test_ChangeDisplaySettingsEx(void) ok(GetClipCursor(&r), "GetClipCursor() failed\n"); ok(EqualRect(&r, &virt), "Invalid clip rect: (%d %d) x (%d %d)\n", r.left, r.top, r.right, r.bottom); - ok(ClipCursor(NULL), "ClipCursor() failed\n"); + if (!ClipCursor(NULL)) continue; ok(GetClipCursor(&r), "GetClipCursor() failed\n"); ok(EqualRect(&r, &virt), "Invalid clip rect: (%d %d) x (%d %d)\n", r.left, r.top, r.right, r.bottom); @@ -368,7 +368,8 @@ static void test_work_area(void) wp.rcNormalPosition.left, wp.rcNormalPosition.top, wp.rcNormalPosition.right, wp.rcNormalPosition.bottom); OffsetRect(&wp.rcNormalPosition, rc_work.left, rc_work.top); - if (!EqualRect(&mi.rcMonitor, &mi.rcWork)) /* FIXME: remove once Wine is fixed */ + if (mi.rcMonitor.left != mi.rcWork.left || + mi.rcMonitor.top != mi.rcWork.top) /* FIXME: remove once Wine is fixed */ todo_wine ok(EqualRect(&rc_normal, &wp.rcNormalPosition), "normal pos is different\n"); else ok(EqualRect(&rc_normal, &wp.rcNormalPosition), "normal pos is different\n");

1 0

Huw Davies : comdlg32: Move the unicode version to the common implementation.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: f63d950df75bdebbad3278790c6c9d11bfe1b226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f63d950df75bdebbad3278790… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 23 15:42:21 2009 +0000 comdlg32: Move the unicode version to the common implementation. --- dlls/comdlg32/printdlg.c | 507 +--------------------------------------------- 1 files changed, 6 insertions(+), 501 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f63d950df75bdebbad327…

1 0

Rob Shearman : rpcrt4: Don't declare functions that aren' t exported by rpcrt4.dll in include/rpcndr.h.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: 05063ece28e2e347cd0331150c89b5aadc66e629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05063ece28e2e347cd0331150… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Jan 23 15:09:18 2009 +0000 rpcrt4: Don't declare functions that aren't exported by rpcrt4.dll in include/rpcndr.h. NdrRangeMarshall, NdrRangeBufferSize, NdrRangeFree and NdrByteCountPointerMemorySize should be declared static in ndr_marshall.c instead. --- dlls/rpcrt4/ndr_marshall.c | 23 +++++++++++++++-------- include/rpcndr.h | 14 ++++++++++++-- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index e3696a6..1ec412d 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -122,6 +122,13 @@ static unsigned char *WINAPI NdrContextHandleMarshall(PMIDL_STUB_MESSAGE, unsign static void WINAPI NdrContextHandleBufferSize(PMIDL_STUB_MESSAGE, unsigned char *, PFORMAT_STRING); static unsigned char *WINAPI NdrContextHandleUnmarshall(PMIDL_STUB_MESSAGE, unsigned char **, PFORMAT_STRING, unsigned char); +static unsigned char *WINAPI NdrRangeMarshall(PMIDL_STUB_MESSAGE,unsigned char *, PFORMAT_STRING); +static void WINAPI NdrRangeBufferSize(PMIDL_STUB_MESSAGE, unsigned char *, PFORMAT_STRING); +static ULONG WINAPI NdrRangeMemorySize(PMIDL_STUB_MESSAGE, PFORMAT_STRING); +static void WINAPI NdrRangeFree(PMIDL_STUB_MESSAGE, unsigned char *, PFORMAT_STRING); + +static ULONG WINAPI NdrByteCountPointerMemorySize(PMIDL_STUB_MESSAGE, PFORMAT_STRING); + const NDR_MARSHALL NdrMarshaller[NDR_TABLE_SIZE] = { 0, NdrBaseTypeMarshall, NdrBaseTypeMarshall, NdrBaseTypeMarshall, @@ -6011,10 +6018,10 @@ void WINAPI NdrByteCountPointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg, } /*********************************************************************** - * NdrByteCountPointerMemorySize [RPCRT4.@] + * NdrByteCountPointerMemorySize [internal] */ -ULONG WINAPI NdrByteCountPointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, - PFORMAT_STRING pFormat) +static ULONG WINAPI NdrByteCountPointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, + PFORMAT_STRING pFormat) { FIXME("stub\n"); return 0; @@ -6086,7 +6093,7 @@ void WINAPI NdrXmitOrRepAsFree(PMIDL_STUB_MESSAGE pStubMsg, /*********************************************************************** * NdrRangeMarshall [internal] */ -unsigned char *WINAPI NdrRangeMarshall( +static unsigned char *WINAPI NdrRangeMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) @@ -6109,7 +6116,7 @@ unsigned char *WINAPI NdrRangeMarshall( } /*********************************************************************** - * NdrRangeUnmarshall + * NdrRangeUnmarshall [RPCRT4.@] */ unsigned char *WINAPI NdrRangeUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, @@ -6209,7 +6216,7 @@ unsigned char *WINAPI NdrRangeUnmarshall( /*********************************************************************** * NdrRangeBufferSize [internal] */ -void WINAPI NdrRangeBufferSize( +static void WINAPI NdrRangeBufferSize( PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) @@ -6232,7 +6239,7 @@ void WINAPI NdrRangeBufferSize( /*********************************************************************** * NdrRangeMemorySize [internal] */ -ULONG WINAPI NdrRangeMemorySize( +static ULONG WINAPI NdrRangeMemorySize( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { @@ -6253,7 +6260,7 @@ ULONG WINAPI NdrRangeMemorySize( /*********************************************************************** * NdrRangeFree [internal] */ -void WINAPI NdrRangeFree(PMIDL_STUB_MESSAGE pStubMsg, +static void WINAPI NdrRangeFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { diff --git a/include/rpcndr.h b/include/rpcndr.h index 6cec8cd..3383c8c 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -562,6 +562,18 @@ RPCRTAPI void RPC_ENTRY RPCRTAPI void RPC_ENTRY NdrSimpleTypeUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, unsigned char FormatChar ); +RPCRTAPI unsigned char* RPC_ENTRY + NdrByteCountPointerMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, PFORMAT_STRING pFormat ); +RPCRTAPI unsigned char* RPC_ENTRY + NdrByteCountPointerUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char** ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc ); +RPCRTAPI void RPC_ENTRY + NdrByteCountPointerBufferSize( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, PFORMAT_STRING pFormat ); +RPCRTAPI void RPC_ENTRY + NdrByteCountPointerFree( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, PFORMAT_STRING pFormat ); + +RPCRTAPI unsigned char* RPC_ENTRY + NdrRangeUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char** ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc ); + /* while MS declares each prototype separately, I prefer to use macros for this kind of thing instead */ #define SIMPLE_TYPE_MARSHAL(type) \ RPCRTAPI unsigned char* RPC_ENTRY \ @@ -590,11 +602,9 @@ TYPE_MARSHAL(VaryingArray) TYPE_MARSHAL(ComplexArray) TYPE_MARSHAL(EncapsulatedUnion) TYPE_MARSHAL(NonEncapsulatedUnion) -TYPE_MARSHAL(ByteCountPointer) TYPE_MARSHAL(XmitOrRepAs) TYPE_MARSHAL(UserMarshal) TYPE_MARSHAL(InterfacePointer) -TYPE_MARSHAL(Range) SIMPLE_TYPE_MARSHAL(ConformantString) SIMPLE_TYPE_MARSHAL(NonConformantString)

1 0

Rob Shearman : rpcrt4: Remove the NDR version check from NdrClientCall2 and NdrStubCall2.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: bcca81f4f44485e9f846e10824d23f397a2bc2b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcca81f4f44485e9f846e1082… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Jan 23 15:09:42 2009 +0000 rpcrt4: Remove the NDR version check from NdrClientCall2 and NdrStubCall2. It does more harm than good, since we can't get any information about what new features are being used by the caller, if any, by bailing at this early point. --- dlls/rpcrt4/ndr_stubless.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 9833483..645a0ca 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -583,12 +583,7 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma TRACE("pStubDesc %p, pFormat %p, ...\n", pStubDesc, pFormat); - /* Later NDR language versions probably won't be backwards compatible */ - if (pStubDesc->Version > 0x50002) - { - FIXME("Incompatible stub description version: 0x%x\n", pStubDesc->Version); - RpcRaiseException(RPC_X_WRONG_STUB_VERSION); - } + TRACE("NDR Version: 0x%x\n", pStubDesc->Version); if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCFLAGS) { @@ -1293,12 +1288,7 @@ LONG WINAPI NdrStubCall2( pFormat = pServerInfo->ProcString + pServerInfo->FmtStringOffset[pRpcMsg->ProcNum]; pProcHeader = (const NDR_PROC_HEADER *)&pFormat[0]; - /* Later NDR language versions probably won't be backwards compatible */ - if (pStubDesc->Version > 0x50002) - { - FIXME("Incompatible stub description version: 0x%x\n", pStubDesc->Version); - RpcRaiseException(RPC_X_WRONG_STUB_VERSION); - } + TRACE("NDR Version: 0x%x\n", pStubDesc->Version); /* create the full pointer translation tables, if requested */ if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_FULLPTR)

1 0

Alexandre Julliard : widl: We need an offset after the correlation descriptor for unencapsulated unions .
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: d02f9d18041b1b2c1ddd6933e843011b23a02039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d02f9d18041b1b2c1ddd6933e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 23 16:47:51 2009 +0100 widl: We need an offset after the correlation descriptor for unencapsulated unions. --- tools/widl/typegen.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 4e0bea0..599e2fe 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2325,6 +2325,8 @@ static size_t write_union_tfs(FILE *file, type_t *type, unsigned int *tfsoff) } *tfsoff += write_conf_or_var_desc(file, NULL, *tfsoff, st, &dummy_expr ); + print_file(file, 2, "NdrFcShort(0x2),\t/* Offset= 2 (%u) */\n", *tfsoff + 2); + *tfsoff += 2; } print_file(file, 2, "NdrFcShort(0x%x),\t/* %d */\n", size, size);

1 0

Huw Davies : comdlg32: Move the initialization code into a common function.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: 69959801d673f20b6e0f8f7a64eeee03a2cbe857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69959801d673f20b6e0f8f7a6… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 23 14:19:46 2009 +0000 comdlg32: Move the initialization code into a common function. --- dlls/comdlg32/printdlg.c | 261 +++++++++++++++++++++++++--------------------- 1 files changed, 141 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69959801d673f20b6e0f8…

1 0

Huw Davies : comdlg32: Add a placeholder for the unicode dialog struct. Update helper functions to work in the unicode case.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: 8d09315b52034537ce7a938383c791658c1888e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d09315b52034537ce7a93838… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 23 15:26:29 2009 +0000 comdlg32: Add a placeholder for the unicode dialog struct. Update helper functions to work in the unicode case. --- dlls/comdlg32/printdlg.c | 278 ++++++++++++++++++++++++++++++++-------------- 1 files changed, 193 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8d09315b52034537ce7a9…

1 0

Florian Köberle : user32: Fixed max size of child with exStyle WS_EX_DGLMODALFRAME.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: 8784702d1f3a2be9d37dd300593add4df907323f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8784702d1f3a2be9d37dd3005… Author: Florian Köberle <florian(a)fkoeberle.de> Date: Tue Jan 20 13:52:40 2009 +0100 user32: Fixed max size of child with exStyle WS_EX_DGLMODALFRAME. --- dlls/user32/tests/win.c | 21 ++++++--------------- dlls/user32/winpos.c | 12 +----------- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d2e9bc6..c49b65f 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5329,21 +5329,12 @@ static LRESULT WINAPI test_thick_child_size_winproc(HWND hwnd, UINT msg, WPARAM expectedMaxSizeY = rect.bottom - rect.top; actualMaxSizeX = minmax->ptMaxSize.x; actualMaxSizeY = minmax->ptMaxSize.y; - if (test_thick_child_exStyle & WS_EX_DLGMODALFRAME) - { - todo_wine - ok(actualMaxSizeX == expectedMaxSizeX && actualMaxSizeY == expectedMaxSizeY, - "expected maxSize %dx%d, actual maxSize %dx%d for %s\n", - expectedMaxSizeX, expectedMaxSizeY, actualMaxSizeX, actualMaxSizeY, - test_thick_child_name); - } - else - { - ok(actualMaxSizeX == expectedMaxSizeX && actualMaxSizeY == expectedMaxSizeY, - "expected maxSize %dx%d, actual maxSize %dx%d for %s\n", - expectedMaxSizeX, expectedMaxSizeY, actualMaxSizeX, actualMaxSizeY, - test_thick_child_name); - } + + ok(actualMaxSizeX == expectedMaxSizeX && actualMaxSizeY == expectedMaxSizeY, + "expected maxSize %dx%d, actual maxSize %dx%d for %s\n", + expectedMaxSizeX, expectedMaxSizeY, actualMaxSizeX, actualMaxSizeY, + test_thick_child_name); + expectedPosX = - getExpectedBorderSize(test_thick_child_style, test_thick_child_exStyle); expectedPosY = expectedPosX; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 54eb34b..4be6a62 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -686,17 +686,7 @@ void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos, MinMax.ptMaxTrackSize.x = GetSystemMetrics(SM_CXMAXTRACK); MinMax.ptMaxTrackSize.y = GetSystemMetrics(SM_CYMAXTRACK); - if (HAS_DLGFRAME( style, exstyle )) - { - xinc = GetSystemMetrics(SM_CXDLGFRAME); - yinc = GetSystemMetrics(SM_CYDLGFRAME); - } - else - { - xinc = yinc = 0; - } - MinMax.ptMaxSize.x += 2 * xinc; - MinMax.ptMaxSize.y += 2 * yinc; + xinc = yinc = 0; } else {

1 0

Florian Köberle : user32: Removed code without effect.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: 4487f85e5878e7aa43da6b73375a2d93b036c7d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4487f85e5878e7aa43da6b733… Author: Florian Köberle <florian(a)fkoeberle.de> Date: Tue Jan 20 13:52:39 2009 +0100 user32: Removed code without effect. --- dlls/user32/winpos.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 4be6a62..6317005 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -676,9 +676,6 @@ void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos, GetClientRect(GetAncestor(hwnd,GA_PARENT), &rc); AdjustWindowRectEx(&rc, style, ((style & WS_POPUP) && GetMenu(hwnd)), exstyle); - /* avoid calculating this twice */ - style &= ~(WS_DLGFRAME | WS_BORDER | WS_THICKFRAME); - MinMax.ptMaxSize.x = rc.right - rc.left; MinMax.ptMaxSize.y = rc.bottom - rc.top; MinMax.ptMinTrackSize.x = GetSystemMetrics(SM_CXMINTRACK);

1 0

Detlef Riekenberg : comdlg32: Fix return type of COMDLG32_StrRetToStrNW.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: 29bdfed9f83a8176247b85b2a8c36f84d641ad49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29bdfed9f83a8176247b85b2a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jan 22 23:39:19 2009 +0100 comdlg32: Fix return type of COMDLG32_StrRetToStrNW. --- dlls/comdlg32/filedlgbrowser.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c index d485d73..704fb98 100644 --- a/dlls/comdlg32/filedlgbrowser.c +++ b/dlls/comdlg32/filedlgbrowser.c @@ -149,7 +149,7 @@ static void COMDLG32_UpdateCurrentDir(const FileOpenDlgInfos *fodInfos) } /* copied from shell32 to avoid linking to it */ -static HRESULT COMDLG32_StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, LPCITEMIDLIST pidl) +static BOOL COMDLG32_StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, LPCITEMIDLIST pidl) { TRACE("dest=%p len=0x%x strret=%p pidl=%p stub\n",dest,len,src,pidl); @@ -181,7 +181,7 @@ static HRESULT COMDLG32_StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, LPC } return(FALSE); } - return S_OK; + return TRUE; } /* @@ -881,7 +881,7 @@ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_IncludeObject(ICommDlgBr if (SUCCEEDED(IShellFolder_GetDisplayNameOf(fodInfos->Shell.FOIShellFolder, pidl, SHGDN_INFOLDER | SHGDN_FORPARSING, &str))) { - if (SUCCEEDED(COMDLG32_StrRetToStrNW(szPathW, MAX_PATH, &str, pidl))) + if (COMDLG32_StrRetToStrNW(szPathW, MAX_PATH, &str, pidl)) { if (PathMatchSpecW(szPathW, fodInfos->ShellInfos.lpstrCurrentFilter)) return S_OK;

1 0