October 2009 - Wine-Commits

Aric Stewart : comctl32/tests: LISTVIEW_ApproximateViewRect tests for LV_VIEW_ICON.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: c885bd16c7be1d40007f68cae259dba6dc293872 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c885bd16c7be1d40007f68cae… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Oct 5 20:42:08 2009 -0500 comctl32/tests: LISTVIEW_ApproximateViewRect tests for LV_VIEW_ICON. --- dlls/comctl32/tests/listview.c | 75 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 75 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 31b09a3..c9551a1 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4021,6 +4021,80 @@ static void test_LVS_EX_TRANSPARENTBKGND(void) DestroyWindow(hwnd); } +void test_ApproximateViewRect(void) +{ + HWND hwnd; + DWORD ret; + INT cx, cy; + HIMAGELIST himl; + HBITMAP hbmp; + LVITEMA itema; + static CHAR test[] = "abracadabra, a very long item label"; + + cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON); + cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON); + + hwnd = create_custom_listview_control(LVS_ICON); + himl = ImageList_Create(40, 40, 0, 4, 4); + ok(himl != NULL, "failed to create imagelist\n"); + hbmp = CreateBitmap(40, 40, 1, 1, NULL); + ok(hbmp != NULL, "failed to create bitmap\n"); + ret = ImageList_Add(himl, hbmp, 0); + expect(0, ret); + ret = SendMessage(hwnd, LVM_SETIMAGELIST, 0, (LPARAM)himl); + expect(0, ret); + + itema.mask = LVIF_IMAGE; + itema.iImage = 0; + itema.iItem = 0; + itema.iSubItem = 0; + ret = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM)&itema); + expect(0, ret); + + ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(75, 75)); + if (ret == 0) + { + /* version 4.0 */ + win_skip("LVM_SETICONSPACING unimplemented. Skipping.\n"); + return; + } + + ret = SendMessage(hwnd, LVM_APPROXIMATEVIEWRECT, 11, MAKELPARAM(100,100)); + ok(MAKELONG(77,827)==ret,"Incorrect Approximate rect\n"); + + ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(50, 50)); + ret = SendMessage(hwnd, LVM_APPROXIMATEVIEWRECT, 11, MAKELPARAM(100,100)); + ok(MAKELONG(102,302)==ret,"Incorrect Approximate rect\n"); + + ret = SendMessage(hwnd, LVM_APPROXIMATEVIEWRECT, -1, MAKELPARAM(100,100)); + ok(MAKELONG(52,52)==ret,"Incorrect Approximate rect\n"); + + itema.pszText = test; + ret = SendMessage(hwnd, LVM_SETITEMTEXT, 0, (LPARAM)&itema); + expect(TRUE, ret); + ret = SendMessage(hwnd, LVM_APPROXIMATEVIEWRECT, -1, MAKELPARAM(100,100)); + ok(MAKELONG(52,52)==ret,"Incorrect Approximate rect\n"); + + ret = SendMessage(hwnd, LVM_APPROXIMATEVIEWRECT, 0, MAKELPARAM(100,100)); + ok(MAKELONG(52,2)==ret,"Incorrect Approximate rect\n"); + ret = SendMessage(hwnd, LVM_APPROXIMATEVIEWRECT, 1, MAKELPARAM(100,100)); + ok(MAKELONG(52,52)==ret,"Incorrect Approximate rect\n"); + ret = SendMessage(hwnd, LVM_APPROXIMATEVIEWRECT, 2, MAKELPARAM(100,100)); + ok(MAKELONG(102,52)==ret,"Incorrect Approximate rect\n"); + ret = SendMessage(hwnd, LVM_APPROXIMATEVIEWRECT, 3, MAKELPARAM(100,100)); + ok(MAKELONG(102,102)==ret,"Incorrect Approximate rect\n"); + ret = SendMessage(hwnd, LVM_APPROXIMATEVIEWRECT, 4, MAKELPARAM(100,100)); + ok(MAKELONG(102,102)==ret,"Incorrect Approximate rect\n"); + ret = SendMessage(hwnd, LVM_APPROXIMATEVIEWRECT, 5, MAKELPARAM(100,100)); + ok(MAKELONG(102,152)==ret,"Incorrect Approximate rect\n"); + ret = SendMessage(hwnd, LVM_APPROXIMATEVIEWRECT, 6, MAKELPARAM(100,100)); + ok(MAKELONG(102,152)==ret,"Incorrect Approximate rect\n"); + ret = SendMessage(hwnd, LVM_APPROXIMATEVIEWRECT, 7, MAKELPARAM(160,100)); + ok(MAKELONG(152,152)==ret,"Incorrect Approximate rect\n"); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -4077,6 +4151,7 @@ START_TEST(listview) test_indentation(); test_getitemspacing(); test_getcolumnwidth(); + test_ApproximateViewRect(); if (!load_v6_module(&ctx_cookie)) {

1 0

Nikolay Sivov : comctl32/monthcal: Fix a nice typo in test message.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: 9e75962ec51eeee9a3b6ff8e48a7beaf055203b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e75962ec51eeee9a3b6ff8e4… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Oct 7 01:02:10 2009 +0400 comctl32/monthcal: Fix a nice typo in test message. --- dlls/comctl32/tests/monthcal.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 8234126..57142a6 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -383,7 +383,7 @@ static void test_monthcal(void) expect(1200, st[1].wMilliseconds); ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st1) == GDTR_MAX, "No limits should be set\n"); - ok(st1[0].wYear != 2000, "Lover limit changed\n"); + ok(st1[0].wYear != 2000, "Lower limit changed\n"); /* invalid timestamp should be replaced with today data, except msecs */ expect(today.wHour, st1[1].wHour); expect(today.wMinute, st1[1].wMinute); @@ -407,10 +407,10 @@ static void test_monthcal(void) st[1].wMonth = 0; ok(!SendMessage(hwnd, MCM_SETRANGE, GDTR_MIN | GDTR_MAX, (LPARAM)st), "Should have failed to set limits\n"); ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st1) == GDTR_MAX, "No limits should be set\n"); - ok(st1[0].wYear != 2000, "Lover limit changed\n"); + ok(st1[0].wYear != 2000, "Lower limit changed\n"); ok(!SendMessage(hwnd, MCM_SETRANGE, GDTR_MAX, (LPARAM)st), "Should have failed to set MAX limit\n"); ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st1) == GDTR_MAX, "No limits should be set\n"); - ok(st1[0].wYear != 2000, "Lover limit changed\n"); + ok(st1[0].wYear != 2000, "Lower limit changed\n"); GetSystemTime(&st[0]); st[0].wDay = 20;

1 0

Henri Verbeet : d3d9: Get rid of the unused "return_data_buffer" in the stateblock tests.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: 063d3d181bc26c0a6599ed1765a072500683d5c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=063d3d181bc26c0a6599ed176… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 09:02:55 2009 +0200 d3d9: Get rid of the unused "return_data_buffer" in the stateblock tests. --- dlls/d3d9/tests/stateblock.c | 31 +++---------------------------- 1 files changed, 3 insertions(+), 28 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index 764e35b..5479bb8 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -437,11 +437,6 @@ struct shader_constant_arg BOOL pshader; }; -struct shader_constant_context -{ - struct shader_constant_data return_data_buffer; -}; - static const struct shader_constant_data shader_constant_poison_data = { {0x1337c0de, 0x1337c0de, 0x1337c0de, 0x1337c0de}, @@ -548,10 +543,7 @@ static void shader_constant_check_data(IDirect3DDevice9 *device, unsigned int ch static HRESULT shader_constant_setup_handler(struct state_test *test) { - struct shader_constant_context *ctx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ctx)); - if (ctx == NULL) return E_FAIL; - test->test_context = ctx; - + test->test_context = NULL; test->test_data_in = &shader_constant_test_data; test->test_data_out = &shader_constant_test_data; test->default_data = &shader_constant_default_data; @@ -590,11 +582,6 @@ struct light_arg unsigned int idx; }; -struct light_context -{ - struct light_data return_data_buffer; -}; - static const struct light_data light_poison_data = { { @@ -771,10 +758,7 @@ static void light_check_data(IDirect3DDevice9 *device, unsigned int chain_stage, static HRESULT light_setup_handler(struct state_test *test) { - struct light_context *ctx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ctx)); - if (ctx == NULL) return E_FAIL; - test->test_context = ctx; - + test->test_context = NULL; test->test_data_in = &light_test_data_in; test->test_data_out = &light_test_data_out; test->default_data = &light_default_data; @@ -810,11 +794,6 @@ struct transform_data D3DMATRIX world255; }; -struct transform_context -{ - struct transform_data return_data_buffer; -}; - static const struct transform_data transform_default_data = { {{{ @@ -1027,10 +1006,7 @@ static void transform_check_data(IDirect3DDevice9 *device, unsigned int chain_st static HRESULT transform_setup_handler(struct state_test *test) { - struct transform_context *ctx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ctx)); - if (ctx == NULL) return E_FAIL; - test->test_context = ctx; - + test->test_context = NULL; test->test_data_in = &transform_test_data; test->test_data_out = &transform_test_data; test->default_data = &transform_default_data; @@ -1178,7 +1154,6 @@ struct render_state_arg struct render_state_context { - struct render_state_data return_data_buffer; struct render_state_data default_data_buffer; struct render_state_data test_data_buffer; struct render_state_data poison_data_buffer;

1 0

Henri Verbeet : d3d8: Get rid of the unused "return_data_buffer" in the stateblock tests.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: 17909a0c521582e66fe0deea68486b986ec3c9d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17909a0c521582e66fe0deea6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 09:02:54 2009 +0200 d3d8: Get rid of the unused "return_data_buffer" in the stateblock tests. --- dlls/d3d8/tests/stateblock.c | 40 ++++++---------------------------------- 1 files changed, 6 insertions(+), 34 deletions(-) diff --git a/dlls/d3d8/tests/stateblock.c b/dlls/d3d8/tests/stateblock.c index 43c56cd..43996f6 100644 --- a/dlls/d3d8/tests/stateblock.c +++ b/dlls/d3d8/tests/stateblock.c @@ -437,11 +437,6 @@ struct shader_constant_arg BOOL pshader; }; -struct shader_constant_context -{ - struct shader_constant_data return_data_buffer; -}; - static const struct shader_constant_data shader_constant_poison_data = { {1.0f, 2.0f, 3.0f, 4.0f}, @@ -508,10 +503,7 @@ static void shader_constant_check_data(IDirect3DDevice8 *device, unsigned int ch static HRESULT shader_constant_setup_handler(struct state_test *test) { - struct shader_constant_context *ctx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ctx)); - if (!ctx) return E_FAIL; - test->test_context = ctx; - + test->test_context = NULL; test->test_data_in = &shader_constant_test_data; test->test_data_out = &shader_constant_test_data; test->default_data = &shader_constant_default_data; @@ -522,7 +514,6 @@ static HRESULT shader_constant_setup_handler(struct state_test *test) static void shader_constant_teardown_handler(struct state_test *test) { - HeapFree(GetProcessHeap(), 0, test->test_context); } static void shader_constants_queue_test(struct state_test *test, const struct shader_constant_arg *test_arg) @@ -550,11 +541,6 @@ struct light_arg unsigned int idx; }; -struct light_context -{ - struct light_data return_data_buffer; -}; - static const struct light_data light_poison_data = { { @@ -731,10 +717,7 @@ static void light_check_data(IDirect3DDevice8 *device, unsigned int chain_stage, static HRESULT light_setup_handler(struct state_test *test) { - struct light_context *ctx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ctx)); - if (!ctx) return E_FAIL; - test->test_context = ctx; - + test->test_context = NULL; test->test_data_in = &light_test_data_in; test->test_data_out = &light_test_data_out; test->default_data = &light_default_data; @@ -745,7 +728,6 @@ static HRESULT light_setup_handler(struct state_test *test) static void light_teardown_handler(struct state_test *test) { - HeapFree(GetProcessHeap(), 0, test->test_context); } static void lights_queue_test(struct state_test *test, const struct light_arg *test_arg) @@ -770,11 +752,6 @@ struct transform_data D3DMATRIX world255; }; -struct transform_context -{ - struct transform_data return_data_buffer; -}; - static const struct transform_data transform_default_data = { {{{ @@ -989,10 +966,7 @@ static void transform_check_data(IDirect3DDevice8 *device, unsigned int chain_st static HRESULT transform_setup_handler(struct state_test *test) { - struct transform_context *ctx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ctx)); - if (!ctx) return E_FAIL; - test->test_context = ctx; - + test->test_context = NULL; test->test_data_in = &transform_test_data; test->test_data_out = &transform_test_data; test->default_data = &transform_default_data; @@ -1003,7 +977,6 @@ static HRESULT transform_setup_handler(struct state_test *test) static void transform_teardown_handler(struct state_test *test) { - HeapFree(GetProcessHeap(), 0, test->test_context); } static void transform_queue_test(struct state_test *test) @@ -1105,10 +1078,9 @@ struct render_state_arg struct render_state_context { - struct render_state_data return_data_buffer; - struct render_state_data default_data_buffer; - struct render_state_data test_data_buffer; - struct render_state_data poison_data_buffer; + struct render_state_data default_data_buffer; + struct render_state_data test_data_buffer; + struct render_state_data poison_data_buffer; }; static void render_state_set_handler(IDirect3DDevice8 *device, const struct state_test *test, const void *data)

1 0

Nikolay Sivov : comctl32/monthcal: Optimize WM_LBUTTONUP handler.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: 71d4b5fcd4ae3f4fb107a7d2fbd876d6f7b9dd3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=71d4b5fcd4ae3f4fb107a7d2f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Oct 7 01:20:48 2009 +0400 comctl32/monthcal: Optimize WM_LBUTTONUP handler. --- dlls/comctl32/monthcal.c | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index a2c7aaa..21c72d1 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1,11 +1,12 @@ -/* Month calendar control - +/* + * Month calendar control * * Copyright 1998, 1999 Eric Kohl (ekohl(a)abo.rhein-zeitung.de) * Copyright 1999 Alex Priem (alexp(a)sci.kun.nl) * Copyright 1999 Chris Morgan <cmorgan(a)wpi.edu> and * James Abbatiello <abbeyj(a)wpi.edu> * Copyright 2000 Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> + * Copyright 2009 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1788,16 +1789,19 @@ static LRESULT MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) { NMHDR nmhdr; - BOOL redraw = FALSE; MCHITTESTINFO ht; DWORD hit; TRACE("\n"); if(infoPtr->status & (MC_PREVPRESSED | MC_NEXTPRESSED)) { + RECT *r; + KillTimer(infoPtr->hwndSelf, MC_PREVNEXTMONTHTIMER); + r = infoPtr->status & MC_PREVPRESSED ? &infoPtr->titlebtnprev : &infoPtr->titlebtnnext; infoPtr->status &= ~(MC_PREVPRESSED | MC_NEXTPRESSED); - redraw = TRUE; + + InvalidateRect(infoPtr->hwndSelf, r, FALSE); } ReleaseCapture(); @@ -1818,9 +1822,7 @@ MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) infoPtr->status = MC_SEL_LBUTUP; MONTHCAL_SetDayFocus(infoPtr, NULL); - if((hit == MCHT_CALENDARDATENEXT) || - (hit == MCHT_CALENDARDATEPREV) || - (hit == MCHT_CALENDARDATE)) + if((hit & MCHT_CALENDARDATE) == MCHT_CALENDARDATE) { SYSTEMTIME sel = infoPtr->curSel; @@ -1839,14 +1841,8 @@ MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) MONTHCAL_NotifySelectionChange(infoPtr); MONTHCAL_NotifySelect(infoPtr); - - return 0; } - /* redraw if necessary */ - if(redraw) - InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); - return 0; }

1 0

Nikolay Sivov : comctl32/monthcal: Use a single timer for auto month scroll with prev/next buttons.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: 70eb6c0385cf8e2c9cd2d9303a32bd20bdb5a57b URL: http://source.winehq.org/git/wine.git/?a=commit;h=70eb6c0385cf8e2c9cd2d9303… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Oct 6 23:23:55 2009 +0400 comctl32/monthcal: Use a single timer for auto month scroll with prev/next buttons. --- dlls/comctl32/monthcal.c | 43 ++++++++++++++----------------------------- 1 files changed, 14 insertions(+), 29 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 42710c0..34528f6 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -66,8 +66,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(monthcal); #define MC_NEXTMONTHDELAY 350 /* when continuously pressing `next */ /* month', wait 500 ms before going */ /* to the next month */ -#define MC_NEXTMONTHTIMER 1 /* Timer ID's */ -#define MC_PREVMONTHTIMER 2 +#define MC_PREVNEXTMONTHTIMER 1 /* Timer ID's */ #define countof(arr) (sizeof(arr)/sizeof(arr[0])) @@ -1679,14 +1678,14 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) case MCHT_TITLEBTNNEXT: MONTHCAL_GoToNextMonth(infoPtr); infoPtr->status = MC_NEXTPRESSED; - SetTimer(infoPtr->hwndSelf, MC_NEXTMONTHTIMER, MC_NEXTMONTHDELAY, 0); + SetTimer(infoPtr->hwndSelf, MC_PREVNEXTMONTHTIMER, MC_NEXTMONTHDELAY, 0); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); return 0; case MCHT_TITLEBTNPREV: MONTHCAL_GoToPrevMonth(infoPtr); infoPtr->status = MC_PREVPRESSED; - SetTimer(infoPtr->hwndSelf, MC_PREVMONTHTIMER, MC_NEXTMONTHDELAY, 0); + SetTimer(infoPtr->hwndSelf, MC_PREVNEXTMONTHTIMER, MC_NEXTMONTHDELAY, 0); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); return 0; @@ -1767,14 +1766,9 @@ MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) TRACE("\n"); - if(infoPtr->status & MC_NEXTPRESSED) { - KillTimer(infoPtr->hwndSelf, MC_NEXTMONTHTIMER); - infoPtr->status &= ~MC_NEXTPRESSED; - redraw = TRUE; - } - if(infoPtr->status & MC_PREVPRESSED) { - KillTimer(infoPtr->hwndSelf, MC_PREVMONTHTIMER); - infoPtr->status &= ~MC_PREVPRESSED; + if(infoPtr->status & (MC_PREVPRESSED | MC_NEXTPRESSED)) { + KillTimer(infoPtr->hwndSelf, MC_PREVNEXTMONTHTIMER); + infoPtr->status &= ~(MC_PREVPRESSED | MC_NEXTPRESSED); redraw = TRUE; } @@ -1830,30 +1824,21 @@ MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) static LRESULT -MONTHCAL_Timer(MONTHCAL_INFO *infoPtr, WPARAM wParam) +MONTHCAL_Timer(MONTHCAL_INFO *infoPtr, WPARAM id) { - BOOL redraw = FALSE; - - TRACE("%ld\n", wParam); + TRACE("%ld\n", id); - switch(wParam) { - case MC_NEXTMONTHTIMER: - redraw = TRUE; - MONTHCAL_GoToNextMonth(infoPtr); - break; - case MC_PREVMONTHTIMER: - redraw = TRUE; - MONTHCAL_GoToPrevMonth(infoPtr); + switch(id) { + case MC_PREVNEXTMONTHTIMER: + if(infoPtr->status & MC_NEXTPRESSED) MONTHCAL_GoToNextMonth(infoPtr); + if(infoPtr->status & MC_PREVPRESSED) MONTHCAL_GoToPrevMonth(infoPtr); + InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); break; default: - ERR("got unknown timer\n"); + ERR("got unknown timer %ld\n", id); break; } - /* redraw only if necessary */ - if(redraw) - InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); - return 0; }

1 0

Damjan Jovanovic : sti: Allow CoCreateInstance aggregation and fix a broken test.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: 0dea7326c333078e02b99d618002f1d21e0244b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dea7326c333078e02b99d618… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Oct 6 19:15:40 2009 +0200 sti: Allow CoCreateInstance aggregation and fix a broken test. --- dlls/sti/sti_main.c | 3 --- dlls/sti/tests/sti.c | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/sti/sti_main.c b/dlls/sti/sti_main.c index 15c946d..4e91698 100644 --- a/dlls/sti/sti_main.c +++ b/dlls/sti/sti_main.c @@ -97,9 +97,6 @@ static HRESULT WINAPI sti_cf_CreateInstance( IClassFactory *iface, LPUNKNOWN pOu *ppobj = NULL; - if (pOuter) - return CLASS_E_NOAGGREGATION; - r = This->pfnCreateInstance( riid, pOuter, (LPVOID *)&punk ); if (FAILED(r)) return r; diff --git a/dlls/sti/tests/sti.c b/dlls/sti/tests/sti.c index 9a1aeee..0575d29 100644 --- a/dlls/sti/tests/sti.c +++ b/dlls/sti/tests/sti.c @@ -218,7 +218,9 @@ static void test_stillimage_aggregation(void) if (SUCCEEDED(hr)) IStillImage_Release(pStiW); hr = CoCreateInstance(&CLSID_Sti, &aggregator, CLSCTX_ALL, &IID_IUnknown, (void**)&pUnknown); - ok(FAILED(hr), "CoCreateInstance unexpectedly succeeded when querying for IUnknown during aggregation\n"); + ok(SUCCEEDED(hr) || + broken(hr == CLASS_E_NOAGGREGATION), /* Win 2000 */ + "CoCreateInstance unexpectedly failed when querying for IUnknown during aggregation, hr = 0x%x\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(pUnknown); }

1 0

Aurimas Fišeras : jscript: Update Lithuanian translation.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: 50b8c47d197661fdff85e6c2a9cd9895d3c9de8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=50b8c47d197661fdff85e6c2a… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Oct 6 18:53:15 2009 +0300 jscript: Update Lithuanian translation. --- dlls/jscript/jscript_Lt.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Lt.rc b/dlls/jscript/jscript_Lt.rc index 83c0680..4d39895 100644 --- a/dlls/jscript/jscript_Lt.rc +++ b/dlls/jscript/jscript_Lt.rc @@ -27,6 +27,7 @@ STRINGTABLE DISCARDABLE { IDS_TO_PRIMITIVE "Klaida keičiant objektą į primityvų tipą" IDS_INVALID_CALL_ARG "Netinkamas kreipinys į procedūrą ar argumentas" + IDS_CREATE_OBJ_ERROR "Automatizacijos serveriui nepavyko sukurti objekto" IDS_NO_PROPERTY "Objektas nepalaiko šios savybės ar metodo" IDS_ARG_NOT_OPT "Argumentas nėra neprivalomas" IDS_SYNTAX_ERROR "Sintaksės klaida"

1 0

Alexandre Julliard : T-shirts announcement.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: website Branch: master Commit: 16de2d5363fb3c91776003ac69f34811251c0d4a URL: http://source.winehq.org/git/website.git/?a=commit;h=16de2d5363fb3c91776003… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 6 18:05:21 2009 +0200 T-shirts announcement. --- news/en/2009100601.xml | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/news/en/2009100601.xml b/news/en/2009100601.xml new file mode 100644 index 0000000..6483ab1 --- /dev/null +++ b/news/en/2009100601.xml @@ -0,0 +1,9 @@ +<news> +<date>October 6, 2009</date> +<title>Wine T-Shirts Available</title> +<body> +<p><a href="http://www.freewear.org">FreeWear.org</a> recently +<a href="http://www.winehq.org/pipermail/wine-devel/2009-September/078366.html">announced</a> +their first <a href="http://www.freewear.org/?page=list_items&org=Wine">Wine T-shirt</a>. +For each T-shirt sold they will donate 3€ to the Wine project. +</p></body></news>

1 0

Alexandre Julliard : advapi32: Retrieve the current user SID from the server in lookup_user_account_name.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: 07ec73fcaa80c754591e13e02bccff06fee742fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=07ec73fcaa80c754591e13e02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 6 16:49:22 2009 +0200 advapi32: Retrieve the current user SID from the server in lookup_user_account_name. --- dlls/advapi32/security.c | 30 +++++++++++++----------------- 1 files changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 9bb76d5..bff68a3 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2555,30 +2555,28 @@ LookupAccountNameA( static BOOL lookup_user_account_name(PSID Sid, PDWORD cbSid, LPWSTR ReferencedDomainName, LPDWORD cchReferencedDomainName, PSID_NAME_USE peUse ) { - /* Default implementation: Always return a default SID */ - SID_IDENTIFIER_AUTHORITY identifierAuthority = {SECURITY_NT_AUTHORITY}; + char buffer[sizeof(TOKEN_USER) + sizeof(SID) + sizeof(DWORD)*SID_MAX_SUB_AUTHORITIES]; + DWORD len = sizeof(buffer); + HANDLE token; BOOL ret; PSID pSid; static const WCHAR dm[] = {'D','O','M','A','I','N',0}; DWORD nameLen; LPCWSTR domainName; - ret = AllocateAndInitializeSid(&identifierAuthority, - 2, - SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - 0, 0, 0, 0, 0, 0, - &pSid); - - if (!ret) - return FALSE; - - if (!RtlValidSid(pSid)) + if (!OpenThreadToken(GetCurrentThread(), TOKEN_READ, TRUE, &token)) { - FreeSid(pSid); - return FALSE; + if (GetLastError() != ERROR_NO_TOKEN) return FALSE; + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &token)) return FALSE; } + ret = GetTokenInformation(token, TokenUser, buffer, len, &len); + CloseHandle( token ); + + if (!ret) return FALSE; + + pSid = ((TOKEN_USER *)buffer)->User.Sid; + if (Sid != NULL && (*cbSid >= GetLengthSid(pSid))) CopySid(*cbSid, Sid, pSid); if (*cbSid < GetLengthSid(pSid)) @@ -2605,8 +2603,6 @@ static BOOL lookup_user_account_name(PSID Sid, PDWORD cbSid, LPWSTR ReferencedDo if (ret) *peUse = SidTypeUser; - FreeSid(pSid); - return ret; }

1 0