January 2009 - Wine-Commits

Alistair Leslie-Hughes : shdocvw: Add test to show IServiceProvider is supported.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: 0a9a1bc99c4d9e5a88c63812e23a99a3cb0482d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a9a1bc99c4d9e5a88c63812e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 23 20:50:36 2009 +1100 shdocvw: Add test to show IServiceProvider is supported. --- dlls/shdocvw/tests/webbrowser.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index dc8b6b2..6002292 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -1990,6 +1990,19 @@ static void test_Navigate2(IUnknown *unk) IWebBrowser2_Release(webbrowser); } +static void test_IServiceProvider(IUnknown *unk) +{ + IServiceProvider *servprov = (void*)0xdeadbeef; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IServiceProvider, (void**)&servprov); + todo_wine ok(hres == S_OK, "QueryInterface returned %08x, expected S_OK\n", hres); + if(FAILED(hres)) + return; + + IServiceProvider_Release(servprov); +} + static void test_QueryInterface(IUnknown *unk) { IQuickActivate *qa = (IQuickActivate*)0xdeadbeef; @@ -2060,6 +2073,7 @@ static void test_WebBrowser(void) test_GetControlInfo(unk); test_wb_funcs(unk, FALSE); test_ConnectionPoint(unk, FALSE); + test_IServiceProvider(unk); IWebBrowser2_Release(wb); ref = IUnknown_Release(unk);

1 0

Hans Leidekker : mscat32: Forward CryptCATCDFEnumMembersByCDFTag to wintrust.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: d019c01088aaff8793d3b0acb67a7f0eb6e7e309 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d019c01088aaff8793d3b0acb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 23 10:33:03 2009 +0100 mscat32: Forward CryptCATCDFEnumMembersByCDFTag to wintrust. --- dlls/mscat32/mscat32.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscat32/mscat32.spec b/dlls/mscat32/mscat32.spec index 37f6e74..3c3c9d8 100644 --- a/dlls/mscat32/mscat32.spec +++ b/dlls/mscat32/mscat32.spec @@ -10,7 +10,7 @@ @ stdcall CryptCATCDFEnumAttributesWithCDFTag(ptr wstr ptr ptr ptr) wintrust.CryptCATCDFEnumAttributesWithCDFTag @ stdcall CryptCATCDFEnumCatAttributes(ptr ptr ptr) wintrust.CryptCATCDFEnumCatAttributes @ stub CryptCATCDFEnumMembers -@ stub CryptCATCDFEnumMembersByCDFTag +@ stdcall CryptCATCDFEnumMembersByCDFTag(ptr wstr ptr ptr long) wintrust.CryptCATCDFEnumMembersByCDFTag @ stdcall CryptCATCDFOpen(wstr ptr) wintrust.CryptCATCDFOpen @ stdcall CryptCATCatalogInfoFromContext(ptr ptr long) wintrust.CryptCATCatalogInfoFromContext @ stdcall CryptCATClose(long) wintrust.CryptCATClose

1 0

Hans Leidekker : rpcrt4: Move NdrGetUserMarshalInfo stub near user marshal functions. Add documentation header.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: 7df0a4ecb2202ae0f2c40d9fe7f3cc097ea63182 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7df0a4ecb2202ae0f2c40d9fe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 23 10:32:44 2009 +0100 rpcrt4: Move NdrGetUserMarshalInfo stub near user marshal functions. Add documentation header. --- dlls/rpcrt4/ndr_marshall.c | 9 +++++++++ dlls/rpcrt4/rpcrt4_main.c | 6 ------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 37d286d..e3696a6 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -4331,6 +4331,15 @@ void WINAPI NdrUserMarshalFree(PMIDL_STUB_MESSAGE pStubMsg, } /*********************************************************************** + * NdrGetUserMarshalInfo [RPCRT4.@] + */ +RPC_STATUS RPC_ENTRY NdrGetUserMarshalInfo(ULONG *flags, ULONG level, NDR_USER_MARSHAL_INFO *mi) +{ + FIXME("(%p,%u,%p)\n", flags, level, mi); + return RPC_X_INVALID_BUFFER; +} + +/*********************************************************************** * NdrClearOutParameters [RPCRT4.@] */ void WINAPI NdrClearOutParameters(PMIDL_STUB_MESSAGE pStubMsg, diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index f1a966f..7380b7a 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -894,9 +894,3 @@ RPC_STATUS RPC_ENTRY RpcCancelThreadEx(void* ThreadHandle, LONG Timeout) else return rpc_cancel_thread(target_tid); } - -RPC_STATUS RPC_ENTRY NdrGetUserMarshalInfo(ULONG *flags, ULONG level, NDR_USER_MARSHAL_INFO *mi) -{ - FIXME("(%p, %u, %p)\n", flags, level, mi); - return RPC_X_INVALID_BUFFER; -}

1 0

Vincent Pelletier : dinput: Implement auto-center set & get.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: 5a24b42b30890f187756a7193dc7827e5add275a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a24b42b30890f187756a7193… Author: Vincent Pelletier <plr.vincent(a)gmail.com> Date: Thu Jan 22 00:00:10 2009 +0100 dinput: Implement auto-center set & get. --- dlls/dinput/joystick_linuxinput.c | 42 ++++++++++++++++++++++++++- dlls/dinput/tests/joystick.c | 57 +++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index da2d0bc..e1b92f7 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -193,6 +193,7 @@ struct JoystickImpl /* Force feedback variables */ struct list ff_effects; int ff_state; + int ff_autocenter; }; static void fake_current_js_state(JoystickImpl *ji); @@ -456,6 +457,10 @@ static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputIm #ifdef HAVE_STRUCT_FF_EFFECT_DIRECTION newDevice->ff_state = FF_STATUS_STOPPED; #endif + /* There is no way in linux to query force feedback autocenter status. + Instead, track it with ff_autocenter, and assume it's initialy + enabled. */ + newDevice->ff_autocenter = 1; InitializeCriticalSection(&newDevice->base.crit); newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JoystickImpl*->base.crit"); @@ -663,6 +668,20 @@ static HRESULT WINAPI JoystickAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) WARN("Could not open %s in read-write mode. Force feedback will be disabled.\n", This->joydev->device); } } + else + { + if (!This->ff_autocenter) + { + struct input_event event; + + /* Disable autocenter. */ + event.type = EV_FF; + event.code = FF_AUTOCENTER; + event.value = 0; + if (write(This->joyfd, &event, sizeof(event)) == -1) + ERR("Failed disabling autocenter: %d %s\n", errno, strerror(errno)); + } + } return DI_OK; } @@ -679,6 +698,7 @@ static HRESULT WINAPI JoystickAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) res = IDirectInputDevice2AImpl_Unacquire(iface); if (res==DI_OK && This->joyfd!=-1) { effect_list_item *itr; + struct input_event event; /* For each known effect: * - stop it @@ -690,6 +710,16 @@ static HRESULT WINAPI JoystickAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) IDirectInputEffect_Unload(itr->ref); } + /* Enable autocenter. */ + event.type = EV_FF; + event.code = FF_AUTOCENTER; + /* TODO: Read autocenter strengh before disabling it, and use it here + * instead of 0xFFFF (maximum strengh). + */ + event.value = 0xFFFF; + if (write(This->joyfd, &event, sizeof(event)) == -1) + ERR("Failed to set autocenter to %04x: %d %s\n", event.value, errno, strerror(errno)); + close(This->joyfd); This->joyfd = -1; } @@ -919,7 +949,9 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, case (DWORD_PTR)DIPROP_AUTOCENTER: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; - FIXME("DIPROP_AUTOCENTER(%d)\n", pd->dwData); + TRACE("autocenter(%d)\n", pd->dwData); + This->ff_autocenter = pd->dwData == DIPROPAUTOCENTER_ON; + break; } case (DWORD_PTR)DIPROP_SATURATION: { @@ -1045,6 +1077,14 @@ static HRESULT WINAPI JoystickAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, TRACE("saturation(%d) obj=%d\n", pd->dwData, obj); break; } + case (DWORD_PTR) DIPROP_AUTOCENTER: + { + LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph; + + pd->dwData = This->ff_autocenter ? DIPROPAUTOCENTER_ON : DIPROPAUTOCENTER_OFF; + TRACE("autocenter(%d)\n", pd->dwData); + break; + } default: return IDirectInputDevice2AImpl_GetProperty(iface, rguid, pdiph); diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index 133ff58..789317e 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -374,6 +374,7 @@ static BOOL CALLBACK EnumJoysticks( if (effect) { DWORD effect_status; + struct DIPROPDWORD diprop_word; hr = IDirectInputEffect_Initialize(effect, hInstance, data->version, &GUID_ConstantForce); @@ -429,6 +430,62 @@ static BOOL CALLBACK EnumJoysticks( ok(hr==DI_OK,"IDirectInputEffect_GetEffectStatus() failed: %08x\n", hr); todo_wine ok(effect_status!=0,"IDirectInputEffect_GetEffectStatus() reported effect as stopped\n"); + /* Check autocenter status + * State: initialy stopped + * enable + * State: enabled + * acquire + * State: enabled + * unacquire + * State: enabled + * + * IDirectInputDevice2_SetProperty(DIPROP_AUTOCENTER) can only be + * executed when devide is released. + * + * If Executed interactively, user can feel that autocenter is + * only disabled when joystick is acquired. + */ + diprop_word.diph.dwSize = sizeof(diprop_word); + diprop_word.diph.dwHeaderSize = sizeof(diprop_word.diph); + diprop_word.diph.dwObj = 0; + diprop_word.diph.dwHow = DIPH_DEVICE; + hr = IDirectInputDevice_Unacquire(pJoystick); + ok(hr==DI_OK,"IDirectInputDevice_Unacquire() failed: %08x\n", hr); + hr = IDirectInputDevice2_GetProperty(pJoystick, DIPROP_AUTOCENTER, &diprop_word.diph); + ok(hr==DI_OK,"IDirectInputDevice2_GetProperty() failed: %08x\n", hr); + ok(diprop_word.dwData==DIPROPAUTOCENTER_ON,"IDirectInputDevice2_GetProperty() reported autocenter as disabled\n"); + diprop_word.dwData = DIPROPAUTOCENTER_OFF; + hr = IDirectInputDevice2_SetProperty(pJoystick, DIPROP_AUTOCENTER, &diprop_word.diph); + ok(hr==DI_OK,"IDirectInputDevice2_SetProperty() failed: %08x\n", hr); + hr = IDirectInputDevice2_GetProperty(pJoystick, DIPROP_AUTOCENTER, &diprop_word.diph); + ok(hr==DI_OK,"IDirectInputDevice2_GetProperty() failed: %08x\n", hr); + ok(diprop_word.dwData==DIPROPAUTOCENTER_OFF,"IDirectInputDevice2_GetProperty() reported autocenter as enabled\n"); + if (winetest_interactive) { + trace("Acquiring in 2s, autocenter will be disabled.\n"); + Sleep(2000); + } + hr = IDirectInputDevice_Acquire(pJoystick); + ok(hr==DI_OK,"IDirectInputDevice_Acquire() failed: %08x\n", hr); + if (winetest_interactive) + trace("Acquired.\n"); + hr = IDirectInputDevice2_GetProperty(pJoystick, DIPROP_AUTOCENTER, &diprop_word.diph); + ok(hr==DI_OK,"IDirectInputDevice2_GetProperty() failed: %08x\n", hr); + ok(diprop_word.dwData==DIPROPAUTOCENTER_OFF,"IDirectInputDevice2_GetProperty() reported autocenter as enabled\n"); + if (winetest_interactive) { + trace("Releasing in 2s, autocenter will be re-enabled.\n"); + Sleep(2000); + } + hr = IDirectInputDevice_Unacquire(pJoystick); + ok(hr==DI_OK,"IDirectInputDevice_Unacquire() failed: %08x\n", hr); + if (winetest_interactive) + trace("Released\n"); + hr = IDirectInputDevice2_GetProperty(pJoystick, DIPROP_AUTOCENTER, &diprop_word.diph); + ok(hr==DI_OK,"IDirectInputDevice2_GetProperty() failed: %08x\n", hr); + ok(diprop_word.dwData==DIPROPAUTOCENTER_OFF,"IDirectInputDevice2_GetProperty() reported autocenter as enabled\n"); + hr = IDirectInputDevice_Acquire(pJoystick); + ok(hr==DI_OK,"IDirectInputDevice_Acquire() failed: %08x\n", hr); + hr = IDirectInputDevice2_GetProperty(pJoystick, DIPROP_AUTOCENTER, &diprop_word.diph); + ref = IUnknown_Release(effect); ok(ref == 0, "IDirectInputDevice_Release() reference count = %d\n", ref); }

1 0

Juan Lang : ntdll: Implement the ThreadAffinityMask query.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: 3d7118bcd18afba27eceeb750290b1a7f4951ea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d7118bcd18afba27eceeb750… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 21 09:51:49 2009 -0800 ntdll: Implement the ThreadAffinityMask query. --- dlls/ntdll/thread.c | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 0904125..56d742d 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1194,6 +1194,26 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, } } return status; + case ThreadAffinityMask: + { + const ULONG_PTR affinity_mask = ((ULONG_PTR)1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1; + ULONG_PTR affinity = 0; + + SERVER_START_REQ( get_thread_info ) + { + req->handle = wine_server_obj_handle( handle ); + req->tid_in = 0; + if (!(status = wine_server_call( req ))) + affinity = reply->affinity & affinity_mask; + } + SERVER_END_REQ; + if (status == STATUS_SUCCESS) + { + if (data) memcpy( data, &affinity, min( length, sizeof(affinity) )); + if (ret_len) *ret_len = min( length, sizeof(affinity) ); + } + } + return status; case ThreadTimes: { KERNEL_USER_TIMES kusrt; @@ -1325,7 +1345,6 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, } case ThreadPriority: case ThreadBasePriority: - case ThreadAffinityMask: case ThreadImpersonationToken: case ThreadEnableAlignmentFaultFixup: case ThreadEventPair_Reusable:

1 0

Florian Köberle : user32: Refactor of WINPOS_GetMinMaxInfo.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: aaddefff5319642477e1c966c408499048fd13a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaddefff5319642477e1c966c… Author: Florian Köberle <florian(a)fkoeberle.de> Date: Tue Jan 20 13:52:35 2009 +0100 user32: Refactor of WINPOS_GetMinMaxInfo. Moved and duplicated the code below the "if child" statement into the if and else block. --- dlls/user32/winpos.c | 59 +++++++++++++++++++++++++++++++------------------ 1 files changed, 37 insertions(+), 22 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index d680cc1..54eb34b 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -681,39 +681,54 @@ void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos, MinMax.ptMaxSize.x = rc.right - rc.left; MinMax.ptMaxSize.y = rc.bottom - rc.top; + MinMax.ptMinTrackSize.x = GetSystemMetrics(SM_CXMINTRACK); + MinMax.ptMinTrackSize.y = GetSystemMetrics(SM_CYMINTRACK); + 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; } else { MinMax.ptMaxSize.x = GetSystemMetrics(SM_CXSCREEN); MinMax.ptMaxSize.y = GetSystemMetrics(SM_CYSCREEN); - } - MinMax.ptMinTrackSize.x = GetSystemMetrics(SM_CXMINTRACK); - MinMax.ptMinTrackSize.y = GetSystemMetrics(SM_CYMINTRACK); - MinMax.ptMaxTrackSize.x = GetSystemMetrics(SM_CXMAXTRACK); - MinMax.ptMaxTrackSize.y = GetSystemMetrics(SM_CYMAXTRACK); + MinMax.ptMinTrackSize.x = GetSystemMetrics(SM_CXMINTRACK); + MinMax.ptMinTrackSize.y = GetSystemMetrics(SM_CYMINTRACK); + 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; - if (HAS_THICKFRAME(style)) + if (HAS_DLGFRAME( style, exstyle )) { - xinc += GetSystemMetrics(SM_CXFRAME); - yinc += GetSystemMetrics(SM_CYFRAME); + xinc = GetSystemMetrics(SM_CXDLGFRAME); + yinc = GetSystemMetrics(SM_CYDLGFRAME); } - if (style & WS_BORDER) + else { - xinc += GetSystemMetrics(SM_CXBORDER); - yinc += GetSystemMetrics(SM_CYBORDER); + xinc = yinc = 0; + if (HAS_THICKFRAME(style)) + { + xinc += GetSystemMetrics(SM_CXFRAME); + yinc += GetSystemMetrics(SM_CYFRAME); + } + if (style & WS_BORDER) + { + xinc += GetSystemMetrics(SM_CXBORDER); + yinc += GetSystemMetrics(SM_CYBORDER); + } } + MinMax.ptMaxSize.x += 2 * xinc; + MinMax.ptMaxSize.y += 2 * yinc; } - MinMax.ptMaxSize.x += 2 * xinc; - MinMax.ptMaxSize.y += 2 * yinc; - MinMax.ptMaxPosition.x = -xinc; MinMax.ptMaxPosition.y = -yinc; if ((win = WIN_GetPtr( hwnd )) && win != WND_DESKTOP && win != WND_OTHER_PROCESS)

1 0

Huw Davies : comdlg32: Remove ugly macro.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: 6ce6194f6c09ccea90429662f5b3c8ae3d350758 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ce6194f6c09ccea90429662f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 22 17:13:12 2009 +0000 comdlg32: Remove ugly macro. --- dlls/comdlg32/printdlg.c | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index da77362..3885c9a 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3432,14 +3432,12 @@ PRINTDLG_PS_WMCommandW( /*********************************************************************** - * DefaultPagePaintHook + * default_page_paint_hook * Default hook paint procedure that receives WM_PSD_* messages from the dialog box * whenever the sample page is redrawn. -*/ - -static UINT_PTR -PRINTDLG_DefaultPagePaintHook(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam, - const pagesetup_data *data) + */ +static UINT_PTR default_page_paint_hook(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam, + const pagesetup_data *data) { LPRECT lprc = (LPRECT) lParam; HDC hdc = (HDC) wParam; @@ -3547,7 +3545,6 @@ PRINTDLG_PagePaintProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) pagesetup_data *data; int papersize=0, orientation=0; /* FIXME: set this values for user paint hook */ double scalx, scaly; -#define CALLPAINTHOOK(msg,lprc) PRINTDLG_DefaultPagePaintHook( hWnd, msg, (WPARAM)hdc, (LPARAM)lprc, data) if (uMsg != WM_PAINT) return CallWindowProcA(lpfnStaticWndProc, hWnd, uMsg, wParam, lParam); @@ -3558,7 +3555,7 @@ PRINTDLG_PagePaintProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) WARN("__WINE_PAGESETUPDLGDATA prop not set?\n"); return FALSE; } - if (PRINTDLG_DefaultPagePaintHook(hWnd, WM_PSD_PAGESETUPDLG, MAKELONG(papersize, orientation), (LPARAM)data->dlga, data)) + if (default_page_paint_hook(hWnd, WM_PSD_PAGESETUPDLG, MAKELONG(papersize, orientation), (LPARAM)data->dlga, data)) return FALSE; hdc = BeginPaint(hWnd, &ps); @@ -3577,8 +3574,8 @@ PRINTDLG_PagePaintProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) rcMargin.left = min(rcMargin.left, rcMargin.right); rcMargin.top = min(rcMargin.top, rcMargin.bottom); - if (!CALLPAINTHOOK(WM_PSD_FULLPAGERECT, &rcClient) && - !CALLPAINTHOOK(WM_PSD_MINMARGINRECT, &rcMargin) ) + if (!default_page_paint_hook(hWnd, WM_PSD_FULLPAGERECT, (WPARAM)hdc, (LPARAM)&rcClient, data) && + !default_page_paint_hook(hWnd, WM_PSD_MINMARGINRECT, (WPARAM)hdc, (LPARAM)&rcMargin, data) ) { /* fill background */ hbrush = GetSysColorBrush(COLOR_3DHIGHLIGHT); @@ -3610,7 +3607,7 @@ PRINTDLG_PagePaintProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) DeleteObject(SelectObject(hdc, holdpen)); DeleteObject(SelectObject(hdc, holdbrush)); - CALLPAINTHOOK(WM_PSD_MARGINRECT, &rcMargin); + default_page_paint_hook(hWnd, WM_PSD_MARGINRECT, (WPARAM)hdc, (LPARAM)&rcMargin, data); /* give text a bit of a space from the frame */ rcMargin.left += 2; @@ -3622,12 +3619,11 @@ PRINTDLG_PagePaintProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) rcMargin.left = min(rcMargin.left, rcMargin.right); rcMargin.top = min(rcMargin.top, rcMargin.bottom); - CALLPAINTHOOK(WM_PSD_GREEKTEXTRECT, &rcMargin); + default_page_paint_hook(hWnd, WM_PSD_GREEKTEXTRECT, (WPARAM)hdc, (LPARAM)&rcMargin, data); } EndPaint(hWnd, &ps); return FALSE; -#undef CALLPAINTHOOK } /*******************************************************

1 0

Huw Davies : comdlg32: Add a function to access the hooks.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: 50843270886518e307ae2391c6fd3c3de2d75b76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50843270886518e307ae2391c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 22 23:11:21 2009 +0000 comdlg32: Add a function to access the hooks. --- dlls/comdlg32/printdlg.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 3885c9a..1d1d2da 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2791,6 +2791,22 @@ static inline RECT *pagesetup_get_margin_rect(const pagesetup_data *data) return &data->dlga->rtMargin; } +typedef enum +{ + page_setup_hook, + page_paint_hook +} hook_type; + +static inline LPPAGESETUPHOOK pagesetup_get_hook(const pagesetup_data *data, hook_type which) +{ + switch(which) + { + case page_setup_hook: return data->dlga->lpfnPageSetupHook; + case page_paint_hook: return data->dlga->lpfnPagePaintHook; + } + return NULL; +} + static inline void swap_point(POINT *pt) { LONG tmp = pt->x; @@ -3448,7 +3464,7 @@ static UINT_PTR default_page_paint_hook(HWND hwndDlg, UINT uMsg, WPARAM wParam, TRACE("uMsg: WM_USER+%d\n",uMsg-WM_USER); /* Call user paint hook if enable */ if (pagesetup_get_flags(data) & PSD_ENABLEPAGEPAINTHOOK) - if (data->dlga->lpfnPagePaintHook(hwndDlg, uMsg, wParam, lParam)) + if (pagesetup_get_hook(data, page_paint_hook)(hwndDlg, uMsg, wParam, lParam)) return TRUE; switch (uMsg) { @@ -3687,7 +3703,7 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) res = TRUE; if (pagesetup_get_flags(data) & PSD_ENABLEPAGESETUPHOOK) { - if (!data->dlga->lpfnPageSetupHook(hDlg,uMsg,wParam,(LPARAM)data->dlga)) + if (!pagesetup_get_hook(data, page_setup_hook)(hDlg, uMsg, wParam, (LPARAM)data->dlga)) FIXME("Setup page hook failed?\n"); } @@ -3748,7 +3764,7 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) } if (pagesetup_get_flags(data) & PSD_ENABLEPAGESETUPHOOK) { - res = data->dlga->lpfnPageSetupHook(hDlg, uMsg, wParam, lParam); + res = pagesetup_get_hook(data, page_setup_hook)(hDlg, uMsg, wParam, lParam); if (res) return res; } }

1 0

Huw Davies : comdlg32: Add a helper to return the dialog struct.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: 2409e33f0826fc5c187f68ed10ce292a1e894b02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2409e33f0826fc5c187f68ed1… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 23 11:12:17 2009 +0000 comdlg32: Add a helper to return the dialog struct. --- dlls/comdlg32/printdlg.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 1d1d2da..12c0b6a 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2807,6 +2807,14 @@ static inline LPPAGESETUPHOOK pagesetup_get_hook(const pagesetup_data *data, hoo return NULL; } +/* This should only be used in calls to hook procs so we return the ptr + already cast to LPARAM */ +static inline LPARAM pagesetup_get_dlg_struct(const pagesetup_data *data) +{ + return (LPARAM)data->dlga; +} + + static inline void swap_point(POINT *pt) { LONG tmp = pt->x; @@ -3571,7 +3579,8 @@ PRINTDLG_PagePaintProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) WARN("__WINE_PAGESETUPDLGDATA prop not set?\n"); return FALSE; } - if (default_page_paint_hook(hWnd, WM_PSD_PAGESETUPDLG, MAKELONG(papersize, orientation), (LPARAM)data->dlga, data)) + if (default_page_paint_hook(hWnd, WM_PSD_PAGESETUPDLG, MAKELONG(papersize, orientation), + pagesetup_get_dlg_struct(data), data)) return FALSE; hdc = BeginPaint(hWnd, &ps); @@ -3703,7 +3712,8 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) res = TRUE; if (pagesetup_get_flags(data) & PSD_ENABLEPAGESETUPHOOK) { - if (!pagesetup_get_hook(data, page_setup_hook)(hDlg, uMsg, wParam, (LPARAM)data->dlga)) + if (!pagesetup_get_hook(data, page_setup_hook)(hDlg, uMsg, wParam, + pagesetup_get_dlg_struct(data))) FIXME("Setup page hook failed?\n"); }

1 0

Hans Leidekker : loadperf: Add stub implementations for InstallPerfDllA/W.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: 0dd925b0010b79548e7df7a75d69d945621b2e94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dd925b0010b79548e7df7a75… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 23 10:32:20 2009 +0100 loadperf: Add stub implementations for InstallPerfDllA/W. --- dlls/loadperf/loadperf.spec | 4 +- dlls/loadperf/loadperf_main.c | 60 +++++++++++++++++++++++++++++++--------- include/loadperf.h | 4 +++ 3 files changed, 52 insertions(+), 16 deletions(-) diff --git a/dlls/loadperf/loadperf.spec b/dlls/loadperf/loadperf.spec index b46fe29..06e7891 100644 --- a/dlls/loadperf/loadperf.spec +++ b/dlls/loadperf/loadperf.spec @@ -1,6 +1,6 @@ @ stub BackupPerfRegistryToFileW -@ stub InstallPerfDllA -@ stub InstallPerfDllW +@ stdcall InstallPerfDllA(str str ptr) +@ stdcall InstallPerfDllW(wstr wstr ptr) @ stub LoadMofFromInstalledServiceA @ stub LoadMofFromInstalledServiceW @ stdcall LoadPerfCounterTextStringsA(str long) diff --git a/dlls/loadperf/loadperf_main.c b/dlls/loadperf/loadperf_main.c index 89a9c4f..54fe2d6 100644 --- a/dlls/loadperf/loadperf_main.c +++ b/dlls/loadperf/loadperf_main.c @@ -50,6 +50,50 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } +static WCHAR *strdupAW(const char *str) +{ + WCHAR *ret = NULL; + if (str) + { + INT len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + if (!(ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) return NULL; + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + } + return ret; +} + +/************************************************************* + * InstallPerfDllA (loadperf.@) + */ +DWORD WINAPI InstallPerfDllA(LPCSTR computer, LPCSTR ini, ULONG_PTR flags) +{ + DWORD ret; + LPWSTR computerW = NULL, iniW = NULL; + + if (computer && !(computerW = strdupAW(computer))) return ERROR_OUTOFMEMORY; + if (ini && !(iniW = strdupAW(ini))) + { + HeapFree(GetProcessHeap(), 0, computerW); + return ERROR_OUTOFMEMORY; + } + + ret = InstallPerfDllW(computerW, iniW, flags); + + HeapFree(GetProcessHeap(), 0, computerW); + HeapFree(GetProcessHeap(), 0, iniW); + + return ret; +} + +/************************************************************* + * InstallPerfDllW (loadperf.@) + */ +DWORD WINAPI InstallPerfDllW(LPCWSTR computer, LPCWSTR ini, ULONG_PTR flags) +{ + FIXME("(%s, %s, %lx)\n", debugstr_w(computer), debugstr_w(ini), flags); + return ERROR_SUCCESS; +} + /************************************************************* * LoadPerfCounterTextStringsA (loadperf.@) * @@ -61,13 +105,7 @@ DWORD WINAPI LoadPerfCounterTextStringsA(LPCSTR cmdline, BOOL quiet) DWORD ret; LPWSTR cmdlineW = NULL; - if (cmdline) - { - INT len = MultiByteToWideChar(CP_ACP, 0, cmdline, -1, NULL, 0); - cmdlineW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!cmdlineW) return ERROR_NOT_ENOUGH_MEMORY; - MultiByteToWideChar(CP_ACP, 0, cmdline, -1, cmdlineW, len); - } + if (cmdline && !(cmdlineW = strdupAW(cmdline))) return ERROR_OUTOFMEMORY; ret = LoadPerfCounterTextStringsW(cmdlineW, quiet); @@ -102,13 +140,7 @@ DWORD WINAPI UnloadPerfCounterTextStringsA(LPCSTR cmdline, BOOL verbose) DWORD ret; LPWSTR cmdlineW = NULL; - if (cmdline) - { - INT len = MultiByteToWideChar(CP_ACP, 0, cmdline, -1, NULL, 0); - cmdlineW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!cmdlineW) return ERROR_NOT_ENOUGH_MEMORY; - MultiByteToWideChar(CP_ACP, 0, cmdline, -1, cmdlineW, len); - } + if (cmdline && !(cmdlineW = strdupAW(cmdline))) return ERROR_OUTOFMEMORY; ret = UnloadPerfCounterTextStringsW(cmdlineW, verbose); diff --git a/include/loadperf.h b/include/loadperf.h index 45679a2..d11186a 100644 --- a/include/loadperf.h +++ b/include/loadperf.h @@ -23,6 +23,10 @@ extern "C" { #endif +DWORD WINAPI InstallPerfDllA(LPCSTR, LPCSTR, ULONG_PTR); +DWORD WINAPI InstallPerfDllW(LPCWSTR, LPCWSTR, ULONG_PTR); +#define InstallPerfDll WINELIB_NAME_AW(InstallPerfDll); + DWORD WINAPI LoadPerfCounterTextStringsA(LPCSTR, BOOL); DWORD WINAPI LoadPerfCounterTextStringsW(LPCWSTR, BOOL); #define LoadPerfCounterTextStrings WINELIB_NAME_AW(LoadPerfCounterTextStrings)

1 0