September 2008 - Wine-commits

Henri Verbeet : wined3d: Split SetGlTextureDesc() up.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: eaf2474003f000ae6d3afc72cc92753146f15435 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaf2474003f000ae6d3afc72c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 24 15:56:47 2008 +0200 wined3d: Split SetGlTextureDesc() up. This creates a function for setting the texture name and one for setting the texture target. The idea is that the texture target should get set right after the surface is created, and won't change, while generating a texture name can wait. --- dlls/wined3d/cubetexture.c | 13 +++++-- dlls/wined3d/surface.c | 64 ++++++++++++++++++++++++++++---------- dlls/wined3d/surface_gdi.c | 15 --------- dlls/wined3d/texture.c | 12 +++++-- dlls/wined3d/wined3d_private.h | 7 +++- include/wine/wined3d_interface.h | 2 - 6 files changed, 69 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eaf2474003f000ae6d3af…

1 0

Louis Lenders : shdocvw: Create default App Paths key for iexplore.exe.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: 567fb5e7dbad8a5dcf6736fb65d269af7b644f20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=567fb5e7dbad8a5dcf6736fb6… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Sep 25 07:48:26 2008 +0000 shdocvw: Create default App Paths key for iexplore.exe. --- dlls/shdocvw/shdocvw.inf | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/shdocvw.inf b/dlls/shdocvw/shdocvw.inf index cec06bc..025c4b1 100644 --- a/dlls/shdocvw/shdocvw.inf +++ b/dlls/shdocvw/shdocvw.inf @@ -140,6 +140,8 @@ HKLM,"Software\Microsoft\Windows\CurrentVersion\URL\Prefixes","www",,"http://" HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",2,"http://www.winehq.org" HKCU,"Software\Microsoft\Internet Explorer\Main","Search Page",2,"http://www.google.com" HKLM,"Software\Microsoft\Internet Explorer\Main","Default_Page_URL",2,"http://www.winehq.org" +HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe",,,"%16422%\Internet Explorer\iexplore.exe" +HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe","Path",,"%16422%\Internet Explorer;" [IE.Reg]

1 0

Michael Stefaniuc : oleaut32/tests: Fix printf format warning.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: 319f28553c2829b2826a56635b080a1b568885a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=319f28553c2829b2826a56635… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 24 19:34:32 2008 +0200 oleaut32/tests: Fix printf format warning. --- dlls/oleaut32/tests/olefont.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 6774368..6b98768 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -140,7 +140,7 @@ static void test_QueryInterface(void) ret = IFont_AddRef(font); ok(ret == 3 || broken(ret == 1), /* win95 */ - "IFont_QI expected ref value 3 but instead got %ld\n",ret); + "IFont_QI expected ref value 3 but instead got %d\n",ret); IFont_Release(font); ok(hres == S_OK,"IFont_QI does not return S_OK, but 0x%08x\n", hres);

1 0

Hans Leidekker : wininet: Support setting username and password through options.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: 8c20124fc42d4249883825345cf0b8e82a534b09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c20124fc42d4249883825345… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 24 16:54:37 2008 +0200 wininet: Support setting username and password through options. --- dlls/wininet/http.c | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 00dfa0f..7cb3961 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3484,11 +3484,32 @@ static DWORD HTTPSESSION_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, voi return INET_QueryOption(option, buffer, size, unicode); } +static DWORD HTTPSESSION_SetOption(WININETHANDLEHEADER *hdr, DWORD option, void *buffer, DWORD size) +{ + WININETHTTPSESSIONW *ses = (WININETHTTPSESSIONW*)hdr; + + switch(option) { + case INTERNET_OPTION_USERNAME: + { + if (!(ses->lpszUserName = WININET_strdupW(buffer))) break; + return ERROR_SUCCESS; + } + case INTERNET_OPTION_PASSWORD: + { + if (!(ses->lpszPassword = WININET_strdupW(buffer))) break; + return ERROR_SUCCESS; + } + default: break; + } + + return ERROR_INTERNET_INVALID_OPTION; +} + static const HANDLEHEADERVtbl HTTPSESSIONVtbl = { HTTPSESSION_Destroy, NULL, HTTPSESSION_QueryOption, - NULL, + HTTPSESSION_SetOption, NULL, NULL, NULL,

1 0

Andrew Talbot : dbghelp: Sign-compare warnings fix.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: c9563e10fc810b065a2330d98c731c488b555c90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9563e10fc810b065a2330d98… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Sep 24 20:50:05 2008 +0100 dbghelp: Sign-compare warnings fix. --- dlls/dbghelp/minidump.c | 4 ++-- dlls/dbghelp/msc.c | 4 ++-- dlls/dbghelp/source.c | 2 +- dlls/dbghelp/stabs.c | 2 +- dlls/dbghelp/stack.c | 2 +- dlls/dbghelp/symbol.c | 2 +- dlls/dbghelp/type.c | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 52458f2..c506be4 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -411,7 +411,7 @@ static unsigned dump_exception_info(struct dump_context* dc, MINIDUMP_EXCEPTION_STREAM mdExcpt; EXCEPTION_RECORD rec, *prec; CONTEXT ctx, *pctx; - int i; + DWORD i; mdExcpt.ThreadId = except->ThreadId; mdExcpt.__alignment = 0; @@ -907,7 +907,7 @@ BOOL WINAPI MiniDumpReadDumpStream(PVOID base, ULONG str_idx, if (mdHead->Signature == MINIDUMP_SIGNATURE) { MINIDUMP_DIRECTORY* dir; - int i; + DWORD i; dir = (MINIDUMP_DIRECTORY*)((char*)base + mdHead->StreamDirectoryRva); for (i = 0; i < mdHead->NumberOfStreams; i++, dir++) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 9b73635..ff322b7 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -68,7 +68,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_msc); static void dump(const void* ptr, unsigned len) { - int i, j; + unsigned int i, j; char msg[128]; const char* hexof = "0123456789abcdef"; const BYTE* x = (const BYTE*)ptr; @@ -829,7 +829,7 @@ static void codeview_add_func_signature_args(struct codeview_type_parse* ctp, sym->rettype = codeview_fetch_type(ctp, ret_type, FALSE); if (args_list && (reftype = codeview_jump_to_type(ctp, args_list))) { - int i; + unsigned int i; switch (reftype->generic.id) { case LF_ARGLIST_V1: diff --git a/dlls/dbghelp/source.c b/dlls/dbghelp/source.c index d02a392..8eef337 100644 --- a/dlls/dbghelp/source.c +++ b/dlls/dbghelp/source.c @@ -235,7 +235,7 @@ BOOL WINAPI SymEnumLines(HANDLE hProcess, ULONG64 base, PCSTR compiland, hash_table_iter_init(&pair.effective->ht_symbols, &hti, NULL); while ((ptr = hash_table_iter_up(&hti))) { - int i; + unsigned int i; sym = GET_ENTRY(ptr, struct symt_ht, hash_elt); if (sym->symt.tag != SymTagFunction) continue; diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index 9955b7e..3cba34f 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -1131,7 +1131,7 @@ static inline void pending_add(struct pending_block* pending, const char* name, static void pending_flush(struct pending_block* pending, struct module* module, struct symt_function* func, struct symt_block* block) { - int i; + unsigned int i; for (i = 0; i < pending->num; i++) { diff --git a/dlls/dbghelp/stack.c b/dlls/dbghelp/stack.c index 9b70f09..04f36fb 100644 --- a/dlls/dbghelp/stack.c +++ b/dlls/dbghelp/stack.c @@ -386,7 +386,7 @@ static BOOL stack_walk(struct stack_walk_callback* cb, LPSTACKFRAME frame) if (curr_mode == stm_16bit) { - int i; + unsigned int i; p = sw_xlat_addr(cb, &frame->AddrFrame); if (!sw_read_mem(cb, p + sizeof(WORD), &val, sizeof(WORD))) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index a4a1683..682f37a 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -795,7 +795,7 @@ static BOOL symt_enum_locals_helper(struct module_pair* pair, { struct symt* lsym = NULL; DWORD pc = pair->pcs->ctx_frame.InstructionOffset; - int i; + unsigned int i; for (i=0; i<vector_length(v); i++) { diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index aeb3e75..3e51782 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -218,7 +218,7 @@ BOOL symt_add_udt_element(struct module* module, struct symt_udt* udt_type, TRACE_(dbghelp_symt)("Adding %s to UDT %s\n", name, udt_type->hash_elt.name); if (name) { - int i; + unsigned int i; for (i=0; i<vector_length(&udt_type->vchildren); i++) { m = *(struct symt_data**)vector_at(&udt_type->vchildren, i); @@ -384,7 +384,7 @@ BOOL WINAPI SymEnumTypes(HANDLE hProcess, ULONG64 BaseOfDll, const char* tmp; struct symt* type; DWORD64 size; - int i; + unsigned int i; TRACE("(%p %s %p %p)\n", hProcess, wine_dbgstr_longlong(BaseOfDll), EnumSymbolsCallback,

1 0

Nikolay Sivov : gdiplus: Implemented GdipResetTextureTransform.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: 31847cf30b23720cb09e9f2861ce58087ad5bf69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31847cf30b23720cb09e9f286… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Sep 25 08:57:55 2008 +0400 gdiplus: Implemented GdipResetTextureTransform. --- dlls/gdiplus/brush.c | 13 +++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/tests/brush.c | 8 ++++++++ include/gdiplusflat.h | 1 + 4 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 3421105..d08fdab 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -898,6 +898,19 @@ GpStatus WINGDIPAPI GdipGetTextureTransform(GpTexture *brush, GpMatrix *matrix) return Ok; } +/****************************************************************************** + * GdipResetTextureTransform [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipResetTextureTransform(GpTexture* brush) +{ + TRACE("(%p)\n", brush); + + if(!brush) + return InvalidParameter; + + return GdipSetMatrixElements(brush->transform, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); +} + GpStatus WINGDIPAPI GdipSetLineBlend(GpLineGradient *brush, GDIPCONST REAL *blend, GDIPCONST REAL* positions, INT count) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 4558a6b..1fe0c8e 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -481,7 +481,7 @@ @ stdcall GdipResetPath(ptr) @ stub GdipResetPathGradientTransform @ stub GdipResetPenTransform -@ stub GdipResetTextureTransform +@ stdcall GdipResetTextureTransform(ptr) @ stdcall GdipResetWorldTransform(ptr) @ stdcall GdipRestoreGraphics(ptr long) @ stdcall GdipReversePath(ptr) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index c69bb99..9dd343b 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -212,6 +212,14 @@ static void test_transform(void) status = GdipIsMatrixEqual(m, m1, &res); expect(Ok, status); expect(TRUE, res); + /* reset */ + status = GdipResetTextureTransform(texture); + expect(Ok, status); + status = GdipGetTextureTransform(texture, m); + expect(Ok, status); + status = GdipIsMatrixIdentity(m, &res); + expect(Ok, status); + expect(TRUE, res); status = GdipDeleteBrush((GpBrush*)texture); expect(Ok, status); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index bc68aae..a888f90 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -248,6 +248,7 @@ GpStatus WINGDIPAPI GdipSetPathGradientSurroundColorsWithCount(GpPathGradient*, GpStatus WINGDIPAPI GdipSetPathGradientWrapMode(GpPathGradient*,GpWrapMode); GpStatus WINGDIPAPI GdipSetSolidFillColor(GpSolidFill*,ARGB); GpStatus WINGDIPAPI GdipSetTextureTransform(GpTexture *,GDIPCONST GpMatrix*); +GpStatus WINGDIPAPI GdipResetTextureTransform(GpTexture*); GpStatus WINGDIPAPI GdipTransformPoints(GpGraphics*, GpCoordinateSpace, GpCoordinateSpace, GpPointF *, INT); GpStatus WINGDIPAPI GdipTransformPointsI(GpGraphics*, GpCoordinateSpace, GpCoordinateSpace,

1 0

Nikolay Sivov : gdiplus: Implemented GdipSetClipRect/GdipSetClipRectI.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: 8d9c4867aed0a6cac2a8f8fc15d95c7d9c85ed72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d9c4867aed0a6cac2a8f8fc1… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Sep 25 10:41:15 2008 +0400 gdiplus: Implemented GdipSetClipRect/GdipSetClipRectI. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 31 +++++++++++++++++++++++++------ dlls/gdiplus/tests/graphics.c | 2 ++ include/gdiplusflat.h | 1 + 4 files changed, 29 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 1fe0c8e..0faf01b 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -509,7 +509,7 @@ @ stub GdipSetClipGraphics @ stub GdipSetClipHrgn @ stub GdipSetClipPath -@ stub GdipSetClipRect +@ stdcall GdipSetClipRect(ptr long long long long long) @ stdcall GdipSetClipRectI(ptr long long long long long) @ stdcall GdipSetClipRegion(ptr ptr long) @ stdcall GdipSetCompositingMode(ptr long) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3689fd3..b36e31c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2948,11 +2948,33 @@ GpStatus WINGDIPAPI GdipTranslateWorldTransform(GpGraphics *graphics, REAL dx, return GdipTranslateMatrix(graphics->worldtrans, dx, dy, order); } +GpStatus WINGDIPAPI GdipSetClipRect(GpGraphics *graphics, REAL x, REAL y, + REAL width, REAL height, + CombineMode mode) +{ + GpRectF rect; + + TRACE("(%p, %.2f, %.2f, %.2f, %.2f, %d)\n", graphics, x, y, width, height, mode); + + if(!graphics) + return InvalidParameter; + + if(graphics->busy) + return ObjectBusy; + + rect.X = x; + rect.Y = y; + rect.Width = width; + rect.Height = height; + + return GdipCombineRegionRect(graphics->clip, &rect, mode); +} + GpStatus WINGDIPAPI GdipSetClipRectI(GpGraphics *graphics, INT x, INT y, INT width, INT height, - CombineMode combineMode) + CombineMode mode) { - static int calls; + TRACE("(%p, %d, %d, %d, %d, %d)\n", graphics, x, y, width, height, mode); if(!graphics) return InvalidParameter; @@ -2960,10 +2982,7 @@ GpStatus WINGDIPAPI GdipSetClipRectI(GpGraphics *graphics, INT x, INT y, if(graphics->busy) return ObjectBusy; - if(!(calls++)) - FIXME("not implemented\n"); - - return NotImplemented; + return GdipSetClipRect(graphics, (REAL)x, (REAL)y, (REAL)width, (REAL)height, mode); } GpStatus WINGDIPAPI GdipSetClipRegion(GpGraphics *graphics, GpRegion *region, diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index a011b91..c000843 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -706,6 +706,8 @@ static void test_Get_Release_DC(void) expect(ObjectBusy, status); status = Ok; status = GdipTranslateWorldTransform(graphics, 0.0, 0.0, MatrixOrderPrepend); expect(ObjectBusy, status); status = Ok; + status = GdipSetClipRect(graphics, 0.0, 0.0, 10.0, 10.0, CombineModeReplace); + expect(ObjectBusy, status); status = Ok; status = GdipSetClipRectI(graphics, 0, 0, 10, 10, CombineModeReplace); expect(ObjectBusy, status); status = Ok; status = GdipSetClipRegion(graphics, clip, CombineModeReplace); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index a888f90..efef67c 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -533,6 +533,7 @@ GpStatus WINGDIPAPI GdipTranslateRegionI(GpRegion *, INT, INT); GpStatus WINGDIPAPI GdipFlush(GpGraphics*, GpFlushIntention); GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpMetafile*,UINT); +GpStatus WINGDIPAPI GdipSetClipRect(GpGraphics*,REAL,REAL,REAL,REAL,CombineMode); GpStatus WINGDIPAPI GdipSetClipRectI(GpGraphics*,INT,INT,INT,INT,CombineMode); GpStatus WINGDIPAPI GdipFillRegion(GpGraphics*,GpBrush*,GpRegion*);

1 0

Andrew Talbot : dbghelp: Sign-compare warnings fix.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: 34ac3f15dd8e1b55803d19bf1e5c26dc83187b05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34ac3f15dd8e1b55803d19bf1… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Sep 24 20:50:00 2008 +0100 dbghelp: Sign-compare warnings fix. --- dlls/dbghelp/dwarf.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index ccd39fb..3667c67 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1036,7 +1036,7 @@ static struct symt* dwarf2_parse_array_type(dwarf2_parse_context_t* ctx, struct symt* idx_type = NULL; struct attribute min, max, cnt; dwarf2_debug_info_t* child; - int i; + unsigned int i; if (di->symt) return di->symt; @@ -1194,7 +1194,7 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_parse_context_t* ctx, if (di->abbrev->have_child) /** any interest to not have child ? */ { dwarf2_debug_info_t* child; - int i; + unsigned int i; for (i=0; i<vector_length(&di->children); i++) { @@ -1269,7 +1269,7 @@ static struct symt* dwarf2_parse_enumeration_type(dwarf2_parse_context_t* ctx, if (di->abbrev->have_child) /* any interest to not have child ? */ { dwarf2_debug_info_t* child; - int i; + unsigned int i; /* FIXME: should we use the sibling stuff ?? */ for (i=0; i<vector_length(&di->children); i++) @@ -1454,7 +1454,7 @@ static void dwarf2_parse_inlined_subroutine(dwarf2_subprogram_t* subpgm, if (di->abbrev->have_child) /** any interest to not have child ? */ { dwarf2_debug_info_t* child; - int i; + unsigned int i; for (i=0; i<vector_length(&di->children); i++) { @@ -1507,7 +1507,7 @@ static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, if (di->abbrev->have_child) /** any interest to not have child ? */ { dwarf2_debug_info_t* child; - int i; + unsigned int i; for (i=0; i<vector_length(&di->children); i++) { @@ -1631,7 +1631,7 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, if (di->abbrev->have_child) /** any interest to not have child ? */ { dwarf2_debug_info_t* child; - int i; + unsigned int i; for (i=0; i<vector_length(&di->children); i++) { @@ -1706,7 +1706,7 @@ static struct symt* dwarf2_parse_subroutine_type(dwarf2_parse_context_t* ctx, if (di->abbrev->have_child) /** any interest to not have child ? */ { dwarf2_debug_info_t* child; - int i; + unsigned int i; for (i=0; i<vector_length(&di->children); i++) { @@ -2065,7 +2065,7 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, if (di->abbrev->have_child) { - int i; + unsigned int i; for (i=0; i<vector_length(&di->children); i++) { pdi = vector_at(&di->children, i); @@ -2121,7 +2121,7 @@ static enum location_error loc_compute_frame(struct process* pcs, struct location* pframe; dwarf2_traverse_context_t lctx; enum location_error err; - int i; + unsigned int i; for (i=0; i<vector_length(&func->vchildren); i++) {

1 0

Nikolay Sivov : gdiplus: Implement GdipGetTextureTransform with test.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: 48b8072518df077e39d2546bfb55d5b7005c6a43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48b8072518df077e39d2546bf… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Sep 25 08:54:24 2008 +0400 gdiplus: Implement GdipGetTextureTransform with test. --- dlls/gdiplus/brush.c | 26 ++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/tests/brush.c | 47 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 75 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 8df2a82..3f58db2 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -485,6 +485,7 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, INT n_x, n_y, n_width, n_height, abs_height, stride, image_stride, i, bytespp; BOOL bm_is_selected; BYTE *dibits, *buff, *textbits; + GpStatus status; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f, %p)\n", image, imageattr, x, y, width, height, texture); @@ -577,6 +578,13 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, *texture = GdipAlloc(sizeof(GpTexture)); if (!*texture) return OutOfMemory; + if((status = GdipCreateMatrix(&(*texture)->transform)) != Ok){ + GdipFree(*texture); + GdipFree(dibits); + GdipFree(buff); + return status; + } + (*texture)->brush.lb.lbStyle = BS_DIBPATTERNPT; (*texture)->brush.lb.lbColor = DIB_RGB_COLORS; (*texture)->brush.lb.lbHatch = (ULONG_PTR)buff; @@ -642,7 +650,10 @@ GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush *brush) break; case BrushTypeSolidColor: case BrushTypeLinearGradient: + break; case BrushTypeTextureFill: + GdipDeleteMatrix(((GpTexture*)brush)->transform); + break; default: break; } @@ -872,6 +883,21 @@ GpStatus WINGDIPAPI GdipGetSolidFillColor(GpSolidFill *sf, ARGB *argb) return Ok; } +/****************************************************************************** + * GdipGetTextureTransform [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipGetTextureTransform(GpTexture *brush, GpMatrix *matrix) +{ + TRACE("(%p, %p)\n", brush, matrix); + + if(!brush || !matrix) + return InvalidParameter; + + memcpy(matrix, brush->transform, sizeof(GpMatrix)); + + return Ok; +} + GpStatus WINGDIPAPI GdipSetLineBlend(GpLineGradient *brush, GDIPCONST REAL *blend, GDIPCONST REAL* positions, INT count) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 8c59810..4558a6b 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -398,7 +398,7 @@ @ stub GdipGetTextContrast @ stdcall GdipGetTextRenderingHint(ptr ptr) @ stub GdipGetTextureImage -@ stub GdipGetTextureTransform +@ stdcall GdipGetTextureTransform(ptr ptr) @ stub GdipGetTextureWrapMode @ stub GdipGetVisibleClipBounds @ stub GdipGetVisibleClipBoundsI diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 8a6ddec..0ca2714 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -138,6 +138,7 @@ struct GpLineGradient{ struct GpTexture{ GpBrush brush; + GpMatrix *transform; }; struct GpPath{ diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index c9f9826..8d1bd27 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -169,6 +169,52 @@ static void test_getgamma(void) GdipDeleteBrush((GpBrush*)line); } +static void test_transform(void) +{ + GpStatus status; + GpTexture *texture; + GpGraphics *graphics = NULL; + GpBitmap *bitmap; + HDC hdc = GetDC(0); + GpMatrix *m; + BOOL res; + + status = GdipCreateMatrix2(2.0, 0.0, 0.0, 0.0, 0.0, 0.0, &m); + expect(Ok, status); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + status = GdipCreateBitmapFromGraphics(1, 1, graphics, &bitmap); + expect(Ok, status); + + status = GdipCreateTexture((GpImage*)bitmap, WrapModeTile, &texture); + expect(Ok, status); + + /* NULL */ + status = GdipGetTextureTransform(NULL, NULL); + expect(InvalidParameter, status); + status = GdipGetTextureTransform(texture, NULL); + expect(InvalidParameter, status); + + /* default value - identity matrix */ + status = GdipGetTextureTransform(texture, m); + expect(Ok, status); + status = GdipIsMatrixIdentity(m, &res); + expect(Ok, status); + expect(TRUE, res); + + status = GdipDeleteBrush((GpBrush*)texture); + expect(Ok, status); + + status = GdipDeleteMatrix(m); + expect(Ok, status); + status = GdipDisposeImage((GpImage*)bitmap); + expect(Ok, status); + status = GdipDeleteGraphics(graphics); + expect(Ok, status); + ReleaseDC(0, hdc); +} + START_TEST(brush) { struct GdiplusStartupInput gdiplusStartupInput; @@ -187,6 +233,7 @@ START_TEST(brush) test_getblend(); test_getbounds(); test_getgamma(); + test_transform(); GdiplusShutdown(gdiplusToken); }

1 0

Nikolay Sivov : gdiplus: Implemented GdipSetTextureTransform with tests.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: edb764fa54ebee1b5bdfae509565b923d7f878ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=edb764fa54ebee1b5bdfae509… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Sep 25 08:56:35 2008 +0400 gdiplus: Implemented GdipSetTextureTransform with tests. --- dlls/gdiplus/brush.c | 8 +++++--- dlls/gdiplus/tests/brush.c | 16 ++++++++++++++-- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 3f58db2..3421105 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1095,16 +1095,18 @@ GpStatus WINGDIPAPI GdipSetSolidFillColor(GpSolidFill *sf, ARGB argb) return Ok; } +/****************************************************************************** + * GdipSetTextureTransform [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipSetTextureTransform(GpTexture *texture, GDIPCONST GpMatrix *matrix) { - static int calls; + TRACE("(%p, %p)\n", texture, matrix); if(!texture || !matrix) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + memcpy(texture->transform, matrix, sizeof(GpMatrix)); return Ok; } diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 8d1bd27..c69bb99 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -176,7 +176,7 @@ static void test_transform(void) GpGraphics *graphics = NULL; GpBitmap *bitmap; HDC hdc = GetDC(0); - GpMatrix *m; + GpMatrix *m, *m1; BOOL res; status = GdipCreateMatrix2(2.0, 0.0, 0.0, 0.0, 0.0, 0.0, &m); @@ -196,16 +196,28 @@ static void test_transform(void) status = GdipGetTextureTransform(texture, NULL); expect(InvalidParameter, status); - /* default value - identity matrix */ + /* get default value - identity matrix */ status = GdipGetTextureTransform(texture, m); expect(Ok, status); status = GdipIsMatrixIdentity(m, &res); expect(Ok, status); expect(TRUE, res); + /* set and get then */ + status = GdipCreateMatrix2(2.0, 0.0, 0.0, 2.0, 0.0, 0.0, &m1); + expect(Ok, status); + status = GdipSetTextureTransform(texture, m1); + expect(Ok, status); + status = GdipGetTextureTransform(texture, m); + expect(Ok, status); + status = GdipIsMatrixEqual(m, m1, &res); + expect(Ok, status); + expect(TRUE, res); status = GdipDeleteBrush((GpBrush*)texture); expect(Ok, status); + status = GdipDeleteMatrix(m1); + expect(Ok, status); status = GdipDeleteMatrix(m); expect(Ok, status); status = GdipDisposeImage((GpImage*)bitmap);

1 0