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

Nikolay Sivov : gdi32: Check header pointer in CreateDIBitmap.
by Alexandre Julliard May 4, 2009

May 4, 2009

Module: wine Branch: master Commit: 0f9bc1d3b7d3529a8162eb8ef5537d314d691121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f9bc1d3b7d3529a8162eb8ef… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 3 12:42:00 2009 +0400 gdi32: Check header pointer in CreateDIBitmap. --- dlls/gdi32/dib.c | 2 ++ dlls/gdi32/tests/bitmap.c | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 0dceaa8..086eaae 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1097,6 +1097,8 @@ HBITMAP WINAPI CreateDIBitmap( HDC hdc, const BITMAPINFOHEADER *header, DWORD compr, size; DC *dc; + if (!header) return 0; + if (DIB_GetBitmapInfo( header, &width, &height, &planes, &bpp, &compr, &size ) == -1) return 0; if (width < 0) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index bfbeee0..a0d4531 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -144,7 +144,12 @@ static void test_createdibitmap(void) bmih.biPlanes = 1; bmih.biBitCount = 32; bmih.biCompression = BI_RGB; - + + hbm = CreateDIBitmap(hdc, NULL, CBM_INIT, NULL, NULL, 0); + ok(hbm == NULL, "CreateDIBitmap should fail\n"); + hbm = CreateDIBitmap(hdc, NULL, 0, NULL, NULL, 0); + ok(hbm == NULL, "CreateDIBitmap should fail\n"); + /* First create an un-initialised bitmap. The depth of the bitmap should match that of the hdc and not that supplied in bmih. */

1 0

Nikolay Sivov : comctl32/listview: Fix LVM_INSERTITEM handling on LVS_SORTxxx styles.
by Alexandre Julliard May 4, 2009

May 4, 2009

Module: wine Branch: master Commit: 2829c5fd1e4d36274031c5e78543b4ec741ba8b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2829c5fd1e4d36274031c5e78… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 3 03:10:43 2009 +0400 comctl32/listview: Fix LVM_INSERTITEM handling on LVS_SORTxxx styles. --- dlls/comctl32/listview.c | 64 ++++++++++++++++----------------------- dlls/comctl32/tests/listview.c | 45 +++++++++++++++++++++++++-- 2 files changed, 67 insertions(+), 42 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 14eaa23..75556e6 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -63,8 +63,9 @@ * -- LISTVIEW_GetNextItem needs to be rewritten. It is currently * linear in the number of items in the list, and this is * unacceptable for large lists. - * -- in sorted mode, LISTVIEW_InsertItemT sorts the array, - * instead of inserting in the right spot + * -- if list is sorted by item text LISTVIEW_InsertItemT could use + * binary search to calculate item index (e.g. DPA_Search()). + * This requires sorted state to be reliably tracked in item modifiers. * -- we should keep an ordered array of coordinates in iconic mode * this would allow to frame items (iterator_frameditems), * and find nearest item (LVFI_NEARESTXY) a lot more efficiently @@ -6592,33 +6593,6 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, return lpht->iItem = iItem; } - -/* LISTVIEW_InsertCompare: callback routine for comparing pszText members of the LV_ITEMS - in a LISTVIEW on insert. Passed to DPA_Sort in LISTVIEW_InsertItem. - This function should only be used for inserting items into a sorted list (LVM_INSERTITEM) - and not during the processing of a LVM_SORTITEMS message. Applications should provide - their own sort proc. when sending LVM_SORTITEMS. -*/ -/* Platform SDK: - (remarks on LVITEM: LVM_INSERTITEM will insert the new item in the proper sort postion... - if: - LVS_SORTXXX must be specified, - LVS_OWNERDRAW is not set, - <item>.pszText is not LPSTR_TEXTCALLBACK. - - (LVS_SORT* flags): "For the LVS_SORTASCENDING... styles, item indices - are sorted based on item text..." -*/ -static INT WINAPI LISTVIEW_InsertCompare( LPVOID first, LPVOID second, LPARAM lParam) -{ - ITEM_INFO* lv_first = DPA_GetPtr( first, 0 ); - ITEM_INFO* lv_second = DPA_GetPtr( second, 0 ); - INT cmpv = textcmpWT(lv_first->hdr.pszText, lv_second->hdr.pszText, TRUE); - - /* if we're sorting descending, negate the return value */ - return (((const LISTVIEW_INFO *)lParam)->dwStyle & LVS_SORTDESCENDING) ? -cmpv : cmpv; -} - /*** * DESCRIPTION: * Inserts a new item in the listview control. @@ -6663,7 +6637,29 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, if (lpLVItem->iItem < 0 && !is_sorted) return -1; - nItem = is_sorted ? infoPtr->nItemCount : min(lpLVItem->iItem, infoPtr->nItemCount); + /* calculate new item index */ + if (is_sorted) + { + HDPA hItem; + ITEM_INFO *item_s; + INT i = 0, cmpv; + + while (i < infoPtr->nItemCount) + { + hItem = DPA_GetPtr( infoPtr->hdpaItems, i); + item_s = (ITEM_INFO*)DPA_GetPtr(hItem, 0); + + cmpv = textcmpWT(item_s->hdr.pszText, lpLVItem->pszText, TRUE); + if (infoPtr->dwStyle & LVS_SORTDESCENDING) cmpv *= -1; + + if (cmpv >= 0) break; + i++; + } + nItem = i; + } + else + nItem = min(lpLVItem->iItem, infoPtr->nItemCount); + TRACE(" inserting at %d, sorted=%d, count=%d, iItem=%d\n", nItem, is_sorted, infoPtr->nItemCount, lpLVItem->iItem); nItem = DPA_InsertPtr( infoPtr->hdpaItems, nItem, hdpaSubItems ); if (nItem == -1) goto fail; @@ -6698,14 +6694,6 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, } if (!set_main_item(infoPtr, &item, TRUE, isW, &has_changed)) goto undo; - /* if we're sorted, sort the list, and update the index */ - if (is_sorted) - { - DPA_Sort( infoPtr->hdpaItems, LISTVIEW_InsertCompare, (LPARAM)infoPtr ); - nItem = DPA_GetPtrIndex( infoPtr->hdpaItems, hdpaSubItems ); - assert(nItem != -1); - } - /* make room for the position, if we are in the right mode */ if ((uView == LVS_SMALLICON) || (uView == LVS_ICON)) { diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 7be6b71..ee5eb7f 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1629,7 +1629,7 @@ static void test_sorting(void) LVITEMA item = {0}; DWORD r; LONG_PTR style; - static CHAR names[][4] = {"A", "B", "C", "D"}; + static CHAR names[][5] = {"A", "B", "C", "D", "0"}; CHAR buff[10]; hwnd = create_listview_control(0); @@ -1744,23 +1744,60 @@ static void test_sorting(void) item.cchTextMax = sizeof(buff); r = SendMessage(hwnd, LVM_GETITEM, 0, (LPARAM) &item); expect(TRUE, r); - todo_wine ok(lstrcmp(buff, names[1]) == 0, "Expected '%s', got '%s'\n", names[1], buff); + ok(lstrcmp(buff, names[1]) == 0, "Expected '%s', got '%s'\n", names[1], buff); item.iItem = 1; r = SendMessage(hwnd, LVM_GETITEM, 0, (LPARAM) &item); expect(TRUE, r); - todo_wine ok(lstrcmp(buff, names[2]) == 0, "Expected '%s', got '%s'\n", names[2], buff); + ok(lstrcmp(buff, names[2]) == 0, "Expected '%s', got '%s'\n", names[2], buff); item.iItem = 2; r = SendMessage(hwnd, LVM_GETITEM, 0, (LPARAM) &item); expect(TRUE, r); - todo_wine ok(lstrcmp(buff, names[0]) == 0, "Expected '%s', got '%s'\n", names[0], buff); + ok(lstrcmp(buff, names[0]) == 0, "Expected '%s', got '%s'\n", names[0], buff); item.iItem = 3; r = SendMessage(hwnd, LVM_GETITEM, 0, (LPARAM) &item); expect(TRUE, r); ok(lstrcmp(buff, names[3]) == 0, "Expected '%s', got '%s'\n", names[3], buff); + /* corner case - item should be placed at first position */ + item.mask = LVIF_TEXT; + item.iItem = 4; + item.iSubItem = 0; + item.pszText = names[4]; + r = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM) &item); + expect(0, r); + + item.iItem = 0; + item.pszText = buff; + item.cchTextMax = sizeof(buff); + r = SendMessage(hwnd, LVM_GETITEM, 0, (LPARAM) &item); + expect(TRUE, r); + ok(lstrcmp(buff, names[4]) == 0, "Expected '%s', got '%s'\n", names[4], buff); + + item.iItem = 1; + item.pszText = buff; + item.cchTextMax = sizeof(buff); + r = SendMessage(hwnd, LVM_GETITEM, 0, (LPARAM) &item); + expect(TRUE, r); + ok(lstrcmp(buff, names[1]) == 0, "Expected '%s', got '%s'\n", names[1], buff); + + item.iItem = 2; + r = SendMessage(hwnd, LVM_GETITEM, 0, (LPARAM) &item); + expect(TRUE, r); + ok(lstrcmp(buff, names[2]) == 0, "Expected '%s', got '%s'\n", names[2], buff); + + item.iItem = 3; + r = SendMessage(hwnd, LVM_GETITEM, 0, (LPARAM) &item); + expect(TRUE, r); + ok(lstrcmp(buff, names[0]) == 0, "Expected '%s', got '%s'\n", names[0], buff); + + item.iItem = 4; + r = SendMessage(hwnd, LVM_GETITEM, 0, (LPARAM) &item); + expect(TRUE, r); + ok(lstrcmp(buff, names[3]) == 0, "Expected '%s', got '%s'\n", names[3], buff); + DestroyWindow(hwnd); }

1 0

Henri Verbeet : wined3d: Select the frontend based on the version token.
by Alexandre Julliard May 4, 2009

May 4, 2009

Module: wine Branch: master Commit: dddd1f021167d2809e09c09d561e912971c2673f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dddd1f021167d2809e09c09d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 4 09:49:27 2009 +0200 wined3d: Select the frontend based on the version token. --- dlls/wined3d/baseshader.c | 17 +++++++++++++++++ dlls/wined3d/pixelshader.c | 24 +++++++++++++++++++----- dlls/wined3d/vertexshader.c | 23 +++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 56 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index b519fe5..e3f6311 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -119,6 +119,23 @@ static const char *shader_opcode_names[] = /* WINED3DSIH_TEXREG2RGB */ "texreg2rgb", }; +#define WINED3D_SM1_VS 0xfffe +#define WINED3D_SM1_PS 0xffff + +const struct wined3d_shader_frontend *shader_select_frontend(DWORD version_token) +{ + switch (version_token >> 16) + { + case WINED3D_SM1_VS: + case WINED3D_SM1_PS: + return &sm1_shader_frontend; + + default: + FIXME("Unrecognised version token %#x\n", version_token); + return NULL; + } +} + static inline BOOL shader_is_version_token(DWORD token) { return shader_is_pshader_version(token) || shader_is_vshader_version(token); diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 33ac91c..c4693a2 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -301,12 +301,20 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_SetFunction(IWineD3DPixelShader *i IWineD3DDeviceImpl *deviceImpl = (IWineD3DDeviceImpl *) This->baseShader.device; unsigned int i, highest_reg_used = 0, num_regs_used = 0; shader_reg_maps *reg_maps = &This->baseShader.reg_maps; + const struct wined3d_shader_frontend *fe; HRESULT hr; TRACE("(%p) : pFunction %p\n", iface, pFunction); + fe = shader_select_frontend(*pFunction); + if (!fe) + { + FIXME("Unable to find frontend for shader.\n"); + return WINED3DERR_INVALIDCALL; + } + /* First pass: trace shader */ - if (TRACE_ON(d3d_shader)) shader_trace_init(&sm1_shader_frontend, pFunction, This->baseShader.shader_ins); + if (TRACE_ON(d3d_shader)) shader_trace_init(fe, pFunction, This->baseShader.shader_ins); /* Initialize immediate constant lists */ list_init(&This->baseShader.constantsF); @@ -314,8 +322,7 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_SetFunction(IWineD3DPixelShader *i list_init(&This->baseShader.constantsI); /* Second pass: figure out which registers are used, what the semantics are, etc.. */ - hr = shader_get_registers_used((IWineD3DBaseShader *)This, &sm1_shader_frontend, - reg_maps, This->semantics_in, NULL, pFunction); + hr = shader_get_registers_used((IWineD3DBaseShader *)This, fe, reg_maps, This->semantics_in, NULL, pFunction); if (FAILED(hr)) return hr; pshader_set_limits(This); @@ -422,10 +429,18 @@ static GLuint pixelshader_compile(IWineD3DPixelShaderImpl *This, const struct ps CONST DWORD *function = This->baseShader.function; GLuint retval; SHADER_BUFFER buffer; + const struct wined3d_shader_frontend *fe; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; TRACE("(%p) : function %p\n", This, function); + fe = shader_select_frontend(This->baseShader.reg_maps.shader_version); + if (!fe) + { + FIXME("Unable to find frontend for shader.\n"); + return WINED3DERR_INVALIDCALL; + } + pixelshader_update_samplers(&This->baseShader.reg_maps, ((IWineD3DDeviceImpl *)This->baseShader.device)->stateBlock->textures); @@ -433,8 +448,7 @@ static GLuint pixelshader_compile(IWineD3DPixelShaderImpl *This, const struct ps TRACE("(%p) : Generating hardware program\n", This); This->cur_args = args; shader_buffer_init(&buffer); - retval = device->shader_backend->shader_generate_pshader((IWineD3DPixelShader *)This, - &sm1_shader_frontend, &buffer, args); + retval = device->shader_backend->shader_generate_pshader((IWineD3DPixelShader *)This, fe, &buffer, args); shader_buffer_free(&buffer); This->cur_args = NULL; diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 9758407..c71b612 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -313,13 +313,21 @@ static HRESULT WINAPI IWineD3DVertexShaderImpl_SetFunction(IWineD3DVertexShader IWineD3DVertexShaderImpl *This =(IWineD3DVertexShaderImpl *)iface; IWineD3DDeviceImpl *deviceImpl = (IWineD3DDeviceImpl *) This->baseShader.device; + const struct wined3d_shader_frontend *fe; HRESULT hr; shader_reg_maps *reg_maps = &This->baseShader.reg_maps; TRACE("(%p) : pFunction %p\n", iface, pFunction); + fe = shader_select_frontend(*pFunction); + if (!fe) + { + FIXME("Unable to find frontend for shader.\n"); + return WINED3DERR_INVALIDCALL; + } + /* First pass: trace shader */ - if (TRACE_ON(d3d_shader)) shader_trace_init(&sm1_shader_frontend, pFunction, This->baseShader.shader_ins); + if (TRACE_ON(d3d_shader)) shader_trace_init(fe, pFunction, This->baseShader.shader_ins); /* Initialize immediate constant lists */ list_init(&This->baseShader.constantsF); @@ -329,7 +337,7 @@ static HRESULT WINAPI IWineD3DVertexShaderImpl_SetFunction(IWineD3DVertexShader /* Second pass: figure out registers used, semantics, etc.. */ This->min_rel_offset = GL_LIMITS(vshader_constantsF); This->max_rel_offset = 0; - hr = shader_get_registers_used((IWineD3DBaseShader*) This, &sm1_shader_frontend, + hr = shader_get_registers_used((IWineD3DBaseShader*) This, fe, reg_maps, This->semantics_in, This->semantics_out, pFunction); if (hr != WINED3D_OK) return hr; @@ -404,15 +412,22 @@ static HRESULT WINAPI IWIneD3DVertexShaderImpl_SetLocalConstantsF(IWineD3DVertex static GLuint vertexshader_compile(IWineD3DVertexShaderImpl *This, const struct vs_compile_args *args) { IWineD3DDeviceImpl *deviceImpl = (IWineD3DDeviceImpl *) This->baseShader.device; + const struct wined3d_shader_frontend *fe; SHADER_BUFFER buffer; GLuint ret; + fe = shader_select_frontend(This->baseShader.reg_maps.shader_version); + if (!fe) + { + FIXME("Unable to find frontend for shader.\n"); + return WINED3DERR_INVALIDCALL; + } + /* Generate the HW shader */ TRACE("(%p) : Generating hardware program\n", This); shader_buffer_init(&buffer); This->cur_args = args; - ret = deviceImpl->shader_backend->shader_generate_vshader((IWineD3DVertexShader *)This, - &sm1_shader_frontend, &buffer, args); + ret = deviceImpl->shader_backend->shader_generate_vshader((IWineD3DVertexShader *)This, fe, &buffer, args); This->cur_args = NULL; shader_buffer_free(&buffer); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b22c191..09d8f9d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2555,6 +2555,7 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 struct wined3d_shader_semantic *semantics_out, const DWORD *byte_code); void shader_init(struct IWineD3DBaseShaderClass *shader, IWineD3DDevice *device, const SHADER_OPCODE *instruction_table); +const struct wined3d_shader_frontend *shader_select_frontend(DWORD version_token); void shader_trace_init(const struct wined3d_shader_frontend *fe, const DWORD *pFunction, const SHADER_OPCODE *opcode_table);

1 0

Francois Gouget : kernel32/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard May 4, 2009

May 4, 2009

Module: wine Branch: master Commit: fc7a85470cec0f439dd2c7e848026d478688941b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc7a85470cec0f439dd2c7e84… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 4 10:50:18 2009 +0200 kernel32/tests: Add a trailing '\n' to ok() calls. --- dlls/kernel32/tests/heap.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index a674e07..39517cc 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -38,23 +38,23 @@ static void test_sized_HeapAlloc(int nbytes) { int success; char *buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nbytes); - ok(buf != NULL, "allocate failed"); - ok(buf[0] == 0, "buffer not zeroed"); + ok(buf != NULL, "allocate failed\n"); + ok(buf[0] == 0, "buffer not zeroed\n"); success = HeapFree(GetProcessHeap(), 0, buf); - ok(success, "free failed"); + ok(success, "free failed\n"); } static void test_sized_HeapReAlloc(int nbytes1, int nbytes2) { int success; char *buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nbytes1); - ok(buf != NULL, "allocate failed"); - ok(buf[0] == 0, "buffer not zeroed"); + ok(buf != NULL, "allocate failed\n"); + ok(buf[0] == 0, "buffer not zeroed\n"); buf = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buf, nbytes2); - ok(buf != NULL, "reallocate failed"); - ok(buf[nbytes2-1] == 0, "buffer not zeroed"); + ok(buf != NULL, "reallocate failed\n"); + ok(buf[nbytes2-1] == 0, "buffer not zeroed\n"); success = HeapFree(GetProcessHeap(), 0, buf); - ok(success, "free failed"); + ok(success, "free failed\n"); } static void test_heap(void)

1 0

Henri Verbeet : wined3d: Add a frontend function to determine if there are any tokens left.
by Alexandre Julliard May 4, 2009

May 4, 2009

Module: wine Branch: master Commit: 5f96c0083a0cd541589cc615e90838f2cbb99c98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f96c0083a0cd541589cc615e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 4 09:49:27 2009 +0200 wined3d: Add a frontend function to determine if there are any tokens left. --- dlls/wined3d/baseshader.c | 8 ++++---- dlls/wined3d/shader_sm1.c | 14 ++++++++++++++ dlls/wined3d/wined3d_private.h | 3 +-- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 9212288..b519fe5 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -326,7 +326,8 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 reg_maps->shader_version = shader_version = *pToken++; pshader = shader_is_pshader_version(shader_version); - while (WINED3DVS_END() != *pToken) { + while (!fe->shader_is_end(&pToken)) + { struct wined3d_shader_instruction ins; const char *comment; UINT param_size; @@ -569,7 +570,6 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 } } } - ++pToken; reg_maps->loop_depth = max_loop_depth; This->baseShader.functionLength = ((char *)pToken - (char *)byte_code); @@ -870,7 +870,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, return; } - while (WINED3DPS_END() != *pToken) + while (!fe->shader_is_end(&pToken)) { const char *comment; UINT param_size; @@ -980,7 +980,7 @@ void shader_trace_init(const struct wined3d_shader_frontend *fe, TRACE("%s_%u_%u\n", shader_is_pshader_version(shader_version) ? "ps": "vs", WINED3DSHADER_VERSION_MAJOR(shader_version), WINED3DSHADER_VERSION_MINOR(shader_version)); - while (WINED3DVS_END() != *pToken) + while (!fe->shader_is_end(&pToken)) { struct wined3d_shader_instruction ins; const char *comment; diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c index 878ba72..225f632 100644 --- a/dlls/wined3d/shader_sm1.c +++ b/dlls/wined3d/shader_sm1.c @@ -84,6 +84,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); #define WINED3DSP_SRCMOD_SHIFT 24 #define WINED3DSP_SRCMOD_MASK (0xf << WINED3DSP_SRCMOD_SHIFT) +#define WINED3DSP_END 0x0000ffff + enum WINED3DSHADER_ADDRESSMODE_TYPE { WINED3DSHADER_ADDRMODE_ABSOLUTE = 0 << WINED3DSHADER_ADDRESSMODE_SHIFT, @@ -303,6 +305,17 @@ static void shader_sm1_read_comment(const DWORD **ptr, const char **comment) *ptr += (token & WINED3DSI_COMMENTSIZE_MASK) >> WINED3DSI_COMMENTSIZE_SHIFT; } +static BOOL shader_sm1_is_end(const DWORD **ptr) +{ + if (**ptr == WINED3DSP_END) + { + ++(*ptr); + return TRUE; + } + + return FALSE; +} + const struct wined3d_shader_frontend sm1_shader_frontend = { shader_sm1_read_opcode, @@ -310,4 +323,5 @@ const struct wined3d_shader_frontend sm1_shader_frontend = shader_sm1_read_dst_param, shader_sm1_read_semantic, shader_sm1_read_comment, + shader_sm1_is_end, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 95af9fe..b22c191 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -475,8 +475,6 @@ typedef enum COMPARISON_TYPE #define WINED3DVS_VERSION(major, minor) (0xfffe0000 | ((major) << 8) | (minor)) #define WINED3DSHADER_VERSION_MAJOR(version) (((version) >> 8) & 0xff) #define WINED3DSHADER_VERSION_MINOR(version) (((version) >> 0) & 0xff) -#define WINED3DPS_END() 0x0000ffff -#define WINED3DVS_END() 0x0000ffff /* Shader backends */ @@ -684,6 +682,7 @@ struct wined3d_shader_frontend struct wined3d_shader_src_param *dst_rel_addr, DWORD shader_version); void (*shader_read_semantic)(const DWORD **ptr, struct wined3d_shader_semantic *semantic); void (*shader_read_comment)(const DWORD **ptr, const char **comment); + BOOL (*shader_is_end)(const DWORD **ptr); }; extern const struct wined3d_shader_frontend sm1_shader_frontend;

1 0

Dmitry Timoshkov : kernel32: Make SystemTimeToTzSpecificLocalTime and TzSpecificLocalTimeToSystemTime prototypes match PSDK .
by Alexandre Julliard May 4, 2009

May 4, 2009

Module: wine Branch: master Commit: 545b40adf74008c2dda4f35338eade4e51bef47a URL: http://source.winehq.org/git/wine.git/?a=commit;h=545b40adf74008c2dda4f3533… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon May 4 17:52:14 2009 +0900 kernel32: Make SystemTimeToTzSpecificLocalTime and TzSpecificLocalTimeToSystemTime prototypes match PSDK. --- dlls/kernel32/time.c | 8 ++++---- include/winbase.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index b30314c..6f953ac 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -443,8 +443,8 @@ BOOL WINAPI SetTimeZoneInformation( const TIME_ZONE_INFORMATION *tzinfo ) */ BOOL WINAPI SystemTimeToTzSpecificLocalTime( - LPTIME_ZONE_INFORMATION lpTimeZoneInformation, - LPSYSTEMTIME lpUniversalTime, LPSYSTEMTIME lpLocalTime ) + const TIME_ZONE_INFORMATION *lpTimeZoneInformation, + const SYSTEMTIME *lpUniversalTime, LPSYSTEMTIME lpLocalTime ) { FILETIME ft; LONG lBias; @@ -489,8 +489,8 @@ BOOL WINAPI SystemTimeToTzSpecificLocalTime( * Failure: FALSE. */ BOOL WINAPI TzSpecificLocalTimeToSystemTime( - LPTIME_ZONE_INFORMATION lpTimeZoneInformation, - LPSYSTEMTIME lpLocalTime, LPSYSTEMTIME lpUniversalTime) + const TIME_ZONE_INFORMATION *lpTimeZoneInformation, + const SYSTEMTIME *lpLocalTime, LPSYSTEMTIME lpUniversalTime) { FILETIME ft; LONG lBias; diff --git a/include/winbase.h b/include/winbase.h index 5a95793..0794fc6 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2098,7 +2098,7 @@ WINBASEAPI DWORD WINAPI SuspendThread(HANDLE); WINBASEAPI void WINAPI SwitchToFiber(LPVOID); WINBASEAPI BOOL WINAPI SwitchToThread(void); WINBASEAPI BOOL WINAPI SystemTimeToFileTime(const SYSTEMTIME*,LPFILETIME); -WINBASEAPI BOOL WINAPI SystemTimeToTzSpecificLocalTime(LPTIME_ZONE_INFORMATION,LPSYSTEMTIME,LPSYSTEMTIME); +WINBASEAPI BOOL WINAPI SystemTimeToTzSpecificLocalTime(const TIME_ZONE_INFORMATION*,const SYSTEMTIME*,LPSYSTEMTIME); WINBASEAPI BOOL WINAPI TerminateJobObject(HANDLE,UINT); WINBASEAPI BOOL WINAPI TerminateProcess(HANDLE,DWORD); WINBASEAPI BOOL WINAPI TerminateThread(HANDLE,DWORD); @@ -2109,7 +2109,7 @@ WINBASEAPI BOOL WINAPI TlsSetValue(DWORD,LPVOID); WINBASEAPI BOOL WINAPI TransactNamedPipe(HANDLE,LPVOID,DWORD,LPVOID,DWORD,LPDWORD,LPOVERLAPPED); WINBASEAPI BOOL WINAPI TransmitCommChar(HANDLE,CHAR); WINBASEAPI BOOL WINAPI TryEnterCriticalSection(CRITICAL_SECTION *lpCrit); -WINBASEAPI BOOL WINAPI TzSpecificLocalTimeToSystemTime(LPTIME_ZONE_INFORMATION,LPSYSTEMTIME,LPSYSTEMTIME); +WINBASEAPI BOOL WINAPI TzSpecificLocalTimeToSystemTime(const TIME_ZONE_INFORMATION*,const SYSTEMTIME*,LPSYSTEMTIME); WINBASEAPI LONG WINAPI UnhandledExceptionFilter(PEXCEPTION_POINTERS); WINBASEAPI BOOL WINAPI UnlockFile(HANDLE,DWORD,DWORD,DWORD,DWORD); WINBASEAPI BOOL WINAPI UnlockFileEx(HANDLE,DWORD,DWORD,DWORD,LPOVERLAPPED);

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard May 4, 2009

May 4, 2009

Module: wine Branch: master Commit: 8a46d0eaf54396824f7fd617e4846a8870698aa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a46d0eaf54396824f7fd617e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 4 10:50:31 2009 +0200 Assorted spelling fixes. --- dlls/comctl32/listview.c | 2 +- dlls/riched20/tests/editor.c | 2 +- dlls/user32/tests/edit.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 967b867..14eaa23 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9816,7 +9816,7 @@ static inline LRESULT LISTVIEW_GetVersion(LISTVIEW_INFO *infoPtr) * [I] iVersion : version to be set * * RETURN: - * -1 when requested version is greater then DLL version; + * -1 when requested version is greater than DLL version; * previous version otherwise */ static LRESULT LISTVIEW_SetVersion(LISTVIEW_INFO *infoPtr, DWORD iVersion) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index bbad748..0383d14 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3421,7 +3421,7 @@ static void test_EM_STREAMOUT_FONTTBL(void) brackCount--; fontTbl++; } - /* checks wether closing bracket is ok */ + /* checks whether closing bracket is ok */ ok(brackCount == 0, "missing closing bracket in \\fonttbl block\n"); if(!brackCount) { diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 8bcd634..399ec4c 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1191,9 +1191,9 @@ static void test_edit_control_5(void) 10, 10, 1, 1, NULL, NULL, NULL, NULL); assert(hWnd); - /* size of non-child edit control is (much) bigger then requested */ + /* size of non-child edit control is (much) bigger than requested */ GetWindowRect( hWnd, &rc); - ok( rc.right - rc.left > 20, "size of the window (%d) is smaller then expected\n", + ok( rc.right - rc.left > 20, "size of the window (%d) is smaller than expected\n", rc.right - rc.left); DestroyWindow(hWnd); /* so create a parent, and give it edit controls children to test with */

1 0

Aric Stewart : msctf: Implement ITfCategoryMgr::UnregisterCategory.
by Alexandre Julliard May 4, 2009

May 4, 2009

Module: wine Branch: master Commit: 6bbd65d07ab3d5d51ca3335bd0b274a5d12dc437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bbd65d07ab3d5d51ca3335bd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 1 10:19:44 2009 -0500 msctf: Implement ITfCategoryMgr::UnregisterCategory. --- dlls/msctf/categorymgr.c | 32 ++++++++++++++++++++++++++++++-- dlls/msctf/tests/inputprocessor.c | 4 ++-- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/msctf/categorymgr.c b/dlls/msctf/categorymgr.c index 648352a..3f47140 100644 --- a/dlls/msctf/categorymgr.c +++ b/dlls/msctf/categorymgr.c @@ -144,9 +144,37 @@ static HRESULT WINAPI CategoryMgr_RegisterCategory ( ITfCategoryMgr *iface, static HRESULT WINAPI CategoryMgr_UnregisterCategory ( ITfCategoryMgr *iface, REFCLSID rclsid, REFGUID rcatid, REFGUID rguid) { + WCHAR fullkey[110]; + WCHAR buf[39]; + WCHAR buf2[39]; + HKEY tipkey; CategoryMgr *This = (CategoryMgr*)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + + static const WCHAR ctg[] = {'C','a','t','e','g','o','r','y',0}; + static const WCHAR itm[] = {'I','t','e','m',0}; + static const WCHAR fmt[] = {'%','s','\\','%','s',0}; + static const WCHAR fmt2[] = {'%','s','\\','%','s','\\','%','s','\\','%','s',0}; + + TRACE("(%p) %s %s %s\n",This,debugstr_guid(rclsid), debugstr_guid(rcatid), debugstr_guid(rguid)); + + StringFromGUID2(rclsid, buf, 39); + sprintfW(fullkey,fmt,szwSystemTIPKey,buf); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,fullkey, 0, KEY_READ | KEY_WRITE, + &tipkey ) != ERROR_SUCCESS) + return E_FAIL; + + StringFromGUID2(rcatid, buf, 39); + StringFromGUID2(rguid, buf2, 39); + sprintfW(fullkey,fmt2,ctg,ctg,buf,buf2); + + sprintfW(fullkey,fmt2,ctg,itm,buf2,buf); + RegDeleteTreeW(tipkey, fullkey); + sprintfW(fullkey,fmt2,ctg,itm,buf2,buf); + RegDeleteTreeW(tipkey, fullkey); + + RegCloseKey(tipkey); + return S_OK; } static HRESULT WINAPI CategoryMgr_EnumCategoriesInItem ( ITfCategoryMgr *iface, diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 8173562..be53391 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -177,9 +177,9 @@ static void test_UnregisterCategory(void) { HRESULT hr; hr = ITfCategoryMgr_UnregisterCategory(g_cm, &CLSID_FakeService, &GUID_TFCAT_TIP_KEYBOARD, &CLSID_FakeService); - todo_wine ok(SUCCEEDED(hr),"ITfCategoryMgr_UnregisterCategory failed\n"); + ok(SUCCEEDED(hr),"ITfCategoryMgr_UnregisterCategory failed\n"); hr = ITfCategoryMgr_UnregisterCategory(g_cm, &CLSID_FakeService, &GUID_TFCAT_DISPLAYATTRIBUTEPROVIDER, &CLSID_FakeService); - todo_wine ok(SUCCEEDED(hr),"ITfCategoryMgr_UnregisterCategory failed\n"); + ok(SUCCEEDED(hr),"ITfCategoryMgr_UnregisterCategory failed\n"); } static void test_FindClosestCategory(void)

1 0

Francois Gouget : msctf/tests: Remove spaces before '\n'.
by Alexandre Julliard May 4, 2009

May 4, 2009

Module: wine Branch: master Commit: 51fbc569d64d969efdce1bc3909ee8835c03f6b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51fbc569d64d969efdce1bc39… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 4 10:50:24 2009 +0200 msctf/tests: Remove spaces before '\n'. --- dlls/msctf/tests/inputprocessor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index ba6d1ee..8173562 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -415,7 +415,7 @@ static void test_KeystrokeMgr(void) todo_wine ok(SUCCEEDED(hr),"ITfKeystrokeMgr_PreserveKey failed\n"); hr =ITfKeystrokeMgr_PreserveKey(keymgr, tid, &CLSID_PreservedKey, &tfpk, NULL, 0); - todo_wine ok(hr == TF_E_ALREADY_EXISTS,"ITfKeystrokeMgr_PreserveKey inproperly succeeded \n"); + todo_wine ok(hr == TF_E_ALREADY_EXISTS,"ITfKeystrokeMgr_PreserveKey inproperly succeeded\n"); preserved = FALSE; hr = ITfKeystrokeMgr_IsPreservedKey(keymgr, &CLSID_PreservedKey, &tfpk, &preserved);

1 0

Stefan Leichter : shell32: Stub for ExtractVersionResource16W.
by Alexandre Julliard May 4, 2009

May 4, 2009

Module: wine Branch: master Commit: ac8c6a526f107fdda3da46ca841c0eb77d099415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac8c6a526f107fdda3da46ca8… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sat May 2 09:51:53 2009 +0200 shell32: Stub for ExtractVersionResource16W. --- dlls/shell32/shell32.spec | 2 +- dlls/shell32/shell32_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index b3fc762..9c4e1ed 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -298,7 +298,7 @@ @ stub ExtractIconResInfoA @ stub ExtractIconResInfoW @ stdcall ExtractIconW(long wstr long) -@ stub ExtractVersionResource16W +@ stdcall ExtractVersionResource16W(wstr long) @ stub FindExeDlgProc @ stdcall FindExecutableA(str str ptr) @ stdcall FindExecutableW(wstr wstr ptr) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index ee62b9c..5706d50 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1194,3 +1194,12 @@ HRESULT WINAPI DllCanUnloadNow(void) FIXME("stub\n"); return S_FALSE; } + +/*********************************************************************** + * ExtractVersionResource16W (SHELL32.@) + */ +BOOL WINAPI ExtractVersionResource16W(LPWSTR s, DWORD d) +{ + FIXME("(%s %x) stub!\n", debugstr_w(s), d); + return FALSE; +}

1 0