January 2009 - Wine-commits

Juan Lang : ntdll: Implement the ThreadAffinityMask query.
by Alexandre Julliard 23 Jan '09

23 Jan '09

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

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

23 Jan '09

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

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

23 Jan '09

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

Hans Leidekker : mscat32: Forward CryptCATCDFEnumMembersByCDFTag to wintrust.
by Alexandre Julliard 23 Jan '09

23 Jan '09

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

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

23 Jan '09

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

Detlef Riekenberg : comdlg32: Fix return type of COMDLG32_StrRetToStrNW.
by Alexandre Julliard 23 Jan '09

23 Jan '09

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

Huw Davies : comdlg32: Fix incorrect scaling.
by Alexandre Julliard 23 Jan '09

23 Jan '09

Module: wine Branch: master Commit: 2e2a0774b4e1f3e4d55673fc434938952d763c77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e2a0774b4e1f3e4d55673fc4… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 22 15:48:01 2009 +0000 comdlg32: Fix incorrect scaling. --- dlls/comdlg32/printdlg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index f7c5901..1adbb90 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3572,8 +3572,8 @@ PRINTDLG_PagePaintProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) rcMargin = rcClient; rcMargin.left += pagesetup_get_margin_rect(data)->left * scalx; - rcMargin.top += pagesetup_get_margin_rect(data)->top * scalx; - rcMargin.right -= pagesetup_get_margin_rect(data)->right * scaly; + rcMargin.top += pagesetup_get_margin_rect(data)->top * scaly; + rcMargin.right -= pagesetup_get_margin_rect(data)->right * scalx; rcMargin.bottom -= pagesetup_get_margin_rect(data)->bottom * scaly; /* if the space is too small then we make sure to not draw anything */

1 0

Huw Davies : comdlg32: Add a helper to access the margin rect.
by Alexandre Julliard 23 Jan '09

23 Jan '09

Module: wine Branch: master Commit: 2bd53e2786b9a7b6cafc2eab22244284d0c0c2b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bd53e2786b9a7b6cafc2eab2… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 22 15:47:07 2009 +0000 comdlg32: Add a helper to access the margin rect. --- dlls/comdlg32/printdlg.c | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index c07e72b..f7c5901 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2789,6 +2789,11 @@ static inline POINT *pagesetup_get_papersize_pt(const pagesetup_data *data) return &data->dlga->ptPaperSize; } +static inline RECT *pagesetup_get_margin_rect(const pagesetup_data *data) +{ + return &data->dlga->rtMargin; +} + static inline void swap_point(POINT *pt) { LONG tmp = pt->x; @@ -3169,7 +3174,7 @@ static void update_margin_edits(HWND hDlg, const pagesetup_data *data, WORD id) { if(id == 0 || id == idx) { - size2str(data, *element_from_margin_id(&data->dlga->rtMargin, idx), str); + size2str(data, *element_from_margin_id(pagesetup_get_margin_rect(data), idx), str); SetDlgItemTextW(hDlg, idx, str); } } @@ -3183,7 +3188,7 @@ static void margin_edit_notification(HWND hDlg, pagesetup_data *data, WORD msg, { WCHAR buf[10]; LONG val = 0; - LONG *value = element_from_margin_id(&data->dlga->rtMargin, id); + LONG *value = element_from_margin_id(pagesetup_get_margin_rect(data), id); if (GetDlgItemTextW(hDlg, id, buf, sizeof(buf) / sizeof(buf[0])) != 0) { @@ -3325,7 +3330,7 @@ static BOOL PRINTDLG_PS_WMCommandA(HWND hDlg, WPARAM wParam, LPARAM lParam, page { pagesetup_set_orientation(data, (id == rad1) ? DMORIENT_PORTRAIT : DMORIENT_LANDSCAPE); pagesetup_update_papersize(data); - rotate_rect(&data->dlga->rtMargin, (id == rad2)); + rotate_rect(pagesetup_get_margin_rect(data), (id == rad2)); update_margin_edits(hDlg, data, 0); pagesetup_change_preview(data); } @@ -3566,10 +3571,10 @@ PRINTDLG_PagePaintProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) scaly = rcClient.bottom / (double)pagesetup_get_papersize_pt(data)->y; rcMargin = rcClient; - rcMargin.left += data->dlga->rtMargin.left * scalx; - rcMargin.top += data->dlga->rtMargin.top * scalx; - rcMargin.right -= data->dlga->rtMargin.right * scaly; - rcMargin.bottom -= data->dlga->rtMargin.bottom * scaly; + rcMargin.left += pagesetup_get_margin_rect(data)->left * scalx; + rcMargin.top += pagesetup_get_margin_rect(data)->top * scalx; + rcMargin.right -= pagesetup_get_margin_rect(data)->right * scaly; + rcMargin.bottom -= pagesetup_get_margin_rect(data)->bottom * scaly; /* if the space is too small then we make sure to not draw anything */ rcMargin.left = min(rcMargin.left, rcMargin.right); @@ -3720,10 +3725,7 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { /* default is 1 inch */ LONG size = thousandths_inch_to_size(data, 1000); - data->dlga->rtMargin.left = size; - data->dlga->rtMargin.top = size; - data->dlga->rtMargin.right = size; - data->dlga->rtMargin.bottom = size; + SetRect(pagesetup_get_margin_rect(data), size, size, size, size); } update_margin_edits(hDlg, data, 0); subclass_margin_edits(hDlg);

1 0

Huw Davies : comdlg32: Simplify the DEVNAMES access functions are unify the release.
by Alexandre Julliard 23 Jan '09

23 Jan '09

Module: wine Branch: master Commit: e2f81f1b33351cad5aa05d31e77cec33a6da34d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f81f1b33351cad5aa05d31e… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 22 16:49:52 2009 +0000 comdlg32: Simplify the DEVNAMES access functions are unify the release. --- dlls/comdlg32/printdlg.c | 73 ++++++++++++++++++++++------------------------ 1 files changed, 35 insertions(+), 38 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 1adbb90..da77362 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2660,59 +2660,56 @@ static void pagesetup_set_defaultsource(pagesetup_data *data, WORD source) GlobalUnlock(data->dlga->hDevMode); } -static WCHAR *pagesetup_get_drvname(const pagesetup_data *data) +typedef enum { - DEVNAMES *dn; - int len; - WCHAR *name; + devnames_driver_name, + devnames_device_name, + devnames_output_name +} devnames_name; - dn = GlobalLock(data->dlga->hDevNames); - len = MultiByteToWideChar(CP_ACP, 0, (char*)dn + dn->wDriverOffset, -1, NULL, 0); - name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, (char*)dn + dn->wDriverOffset, -1, name, len); - GlobalUnlock(data->dlga->hDevNames); - return name; -} -static void pagesetup_release_drvname(const pagesetup_data *data, WCHAR *name) +static inline WORD get_devname_offset(DEVNAMES *dn, devnames_name which) { - HeapFree(GetProcessHeap(), 0, name); + switch(which) + { + case devnames_driver_name: return dn->wDriverOffset; + case devnames_device_name: return dn->wDeviceOffset; + case devnames_output_name: return dn->wOutputOffset; + } + ERR("Souldn't be here\n"); + return 0; } -static WCHAR *pagesetup_get_devname(const pagesetup_data *data) +static WCHAR *pagesetup_get_a_devname(const pagesetup_data *data, devnames_name which) { DEVNAMES *dn; int len; WCHAR *name; dn = GlobalLock(data->dlga->hDevNames); - len = MultiByteToWideChar(CP_ACP, 0, (char*)dn + dn->wDeviceOffset, -1, NULL, 0); + len = MultiByteToWideChar(CP_ACP, 0, (char*)dn + get_devname_offset(dn, which), -1, NULL, 0); name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, (char*)dn + dn->wDeviceOffset, -1, name, len); + MultiByteToWideChar(CP_ACP, 0, (char*)dn + get_devname_offset(dn, which), -1, name, len); GlobalUnlock(data->dlga->hDevNames); return name; } -static void pagesetup_release_devname(const pagesetup_data *data, WCHAR *name) +static WCHAR *pagesetup_get_drvname(const pagesetup_data *data) { - HeapFree(GetProcessHeap(), 0, name); + return pagesetup_get_a_devname(data, devnames_driver_name); } -static WCHAR *pagesetup_get_portname(const pagesetup_data *data) +static WCHAR *pagesetup_get_devname(const pagesetup_data *data) { - DEVNAMES *dn; - int len; - WCHAR *name; + return pagesetup_get_a_devname(data, devnames_device_name); +} - dn = GlobalLock(data->dlga->hDevNames); - len = MultiByteToWideChar(CP_ACP, 0, (char*)dn + dn->wOutputOffset, -1, NULL, 0); - name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, (char*)dn + dn->wOutputOffset, -1, name, len); - GlobalUnlock(data->dlga->hDevNames); - return name; +static WCHAR *pagesetup_get_portname(const pagesetup_data *data) +{ + return pagesetup_get_a_devname(data, devnames_output_name); } -static void pagesetup_release_portname(const pagesetup_data *data, WCHAR *name) +static void pagesetup_release_a_devname(const pagesetup_data *data, WCHAR *name) { HeapFree(GetProcessHeap(), 0, name); } @@ -2860,8 +2857,8 @@ static BOOL pagesetup_update_papersize(pagesetup_data *data) end: HeapFree(GetProcessHeap(), 0, words); HeapFree(GetProcessHeap(), 0, points); - pagesetup_release_portname(data, portname); - pagesetup_release_devname(data, devname); + pagesetup_release_a_devname(data, portname); + pagesetup_release_a_devname(data, devname); pagesetup_release_devmode(data, dm); return retval; @@ -2991,8 +2988,8 @@ static void pagesetup_init_combos(HWND hDlg, pagesetup_data *data) PRINTDLG_SetUpPaperComboBoxW(hDlg, cmb2, devname, portname, dm); PRINTDLG_SetUpPaperComboBoxW(hDlg, cmb3, devname, portname, dm); - pagesetup_release_portname(data, portname); - pagesetup_release_devname(data, devname); + pagesetup_release_a_devname(data, portname); + pagesetup_release_a_devname(data, devname); pagesetup_release_devmode(data, dm); } @@ -3020,9 +3017,9 @@ static void pagesetup_change_printer_dialog(HWND hDlg, pagesetup_data *data) portname = pagesetup_get_portname(data); prnt.hDevNames = 0; PRINTDLG_CreateDevNamesW(&prnt.hDevNames, drvname, devname, portname); - pagesetup_release_portname(data, portname); - pagesetup_release_devname(data, devname); - pagesetup_release_drvname(data, drvname); + pagesetup_release_a_devname(data, portname); + pagesetup_release_a_devname(data, devname); + pagesetup_release_a_devname(data, drvname); tmp_dm = pagesetup_get_devmode(data); prnt.hDevMode = GlobalAlloc(GMEM_MOVEABLE, tmp_dm->dmSize + tmp_dm->dmDriverExtra); @@ -3259,7 +3256,7 @@ static void pagesetup_printer_properties(HWND hDlg, pagesetup_data *data) if (!OpenPrinterW(devname, &hprn, NULL)) { FIXME("Call to OpenPrinter did not succeed!\n"); - pagesetup_release_devname(data, devname); + pagesetup_release_a_devname(data, devname); return; } @@ -3267,7 +3264,7 @@ static void pagesetup_printer_properties(HWND hDlg, pagesetup_data *data) DocumentPropertiesW(hDlg, hprn, devname, dm, dm, DM_IN_BUFFER | DM_OUT_BUFFER | DM_IN_PROMPT); pagesetup_set_devmode(data, dm); pagesetup_release_devmode(data, dm); - pagesetup_release_devname(data, devname); + pagesetup_release_a_devname(data, devname); ClosePrinter(hprn); /* Changing paper */

1 0

Huw Davies : comdlg32: Remove ugly macro.
by Alexandre Julliard 23 Jan '09

23 Jan '09

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