January 2008 - Wine-commits

Rob Shearman : ole32: Fix some uses of SEEK_SET when STREAM_SEEK_SET should have been used instead .
by Alexandre Julliard 09 Jan '08

09 Jan '08

Module: wine Branch: master Commit: b02b9496d2c88d682522d09ae50c6c013eb8e358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b02b9496d2c88d682522d09ae… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 8 18:14:07 2008 +0000 ole32: Fix some uses of SEEK_SET when STREAM_SEEK_SET should have been used instead. --- dlls/ole32/oleproxy.c | 2 +- dlls/ole32/rpc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index d37c2cf..55aa3c5 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -206,7 +206,7 @@ getbuffer: if (hres) return hres; seekto.u.LowPart = 0;seekto.u.HighPart = 0; - hres = IStream_Seek(pStm,seekto,SEEK_SET,&newpos); + hres = IStream_Seek(pStm,seekto,STREAM_SEEK_SET,&newpos); if (hres) { FIXME("IStream_Seek failed, %x\n",hres); return hres; diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 31b9eb1..027d0ee 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1823,7 +1823,7 @@ HRESULT RPC_GetLocalClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) hres = IStream_Write(pStm,marshalbuffer,bufferlen,&res); if (hres) goto out; seekto.u.LowPart = 0;seekto.u.HighPart = 0; - hres = IStream_Seek(pStm,seekto,SEEK_SET,&newpos); + hres = IStream_Seek(pStm,seekto,STREAM_SEEK_SET,&newpos); TRACE("unmarshalling classfactory\n"); hres = CoUnmarshalInterface(pStm,&IID_IClassFactory,ppv); @@ -1907,7 +1907,7 @@ static DWORD WINAPI local_server_thread(LPVOID param) seekto.u.LowPart = 0; seekto.u.HighPart = 0; - hres = IStream_Seek(pStm,seekto,SEEK_SET,&newpos); + hres = IStream_Seek(pStm,seekto,STREAM_SEEK_SET,&newpos); if (hres) { FIXME("IStream_Seek failed, %x\n",hres); CloseHandle(hPipe);

1 0

Rob Shearman : rpcrt4: Fix a leak of msg in RPCRT4_io_thread on the error paths.
by Alexandre Julliard 09 Jan '08

09 Jan '08

Module: wine Branch: master Commit: 5be085dec5ef3ef427758cce3a7c2eac01a9cd1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5be085dec5ef3ef427758cce3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 8 18:14:27 2008 +0000 rpcrt4: Fix a leak of msg in RPCRT4_io_thread on the error paths. --- dlls/rpcrt4/rpc_server.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 9266187..bb50018 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -370,15 +370,18 @@ static DWORD CALLBACK RPCRT4_io_thread(LPVOID the_arg) } packet = HeapAlloc(GetProcessHeap(), 0, sizeof(RpcPacket)); - if (!packet) - break; + if (!packet) { + HeapFree(GetProcessHeap(), 0, msg); + break; + } packet->conn = conn; packet->hdr = hdr; packet->msg = msg; if (!QueueUserWorkItem(RPCRT4_worker_thread, packet, WT_EXECUTELONGFUNCTION)) { - ERR("couldn't queue work item for worker thread, error was %d\n", GetLastError()); - HeapFree(GetProcessHeap(), 0, packet); - break; + ERR("couldn't queue work item for worker thread, error was %d\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, msg); + HeapFree(GetProcessHeap(), 0, packet); + break; } msg = NULL;

1 0

Rob Shearman : rpcrt4: Implement NdrMapCommAndFaultStatus.
by Alexandre Julliard 09 Jan '08

09 Jan '08

Module: wine Branch: master Commit: e0c67a189b79725c6b588f297a8dd1a482414f67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0c67a189b79725c6b588f297… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 8 18:14:20 2008 +0000 rpcrt4: Implement NdrMapCommAndFaultStatus. Add tests for this function. --- dlls/rpcrt4/ndr_clientserver.c | 27 +++++++++++++++++++--- dlls/rpcrt4/tests/ndr_marshall.c | 44 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_clientserver.c b/dlls/rpcrt4/ndr_clientserver.c index 58d21c6..1afab2a 100644 --- a/dlls/rpcrt4/ndr_clientserver.c +++ b/dlls/rpcrt4/ndr_clientserver.c @@ -216,10 +216,29 @@ RPC_STATUS RPC_ENTRY NdrMapCommAndFaultStatus( PMIDL_STUB_MESSAGE pStubMsg, ULONG *pFaultStatus, RPC_STATUS Status ) { - FIXME("(%p, %p, %p, %ld): stub\n", pStubMsg, pCommStatus, pFaultStatus, Status); - - *pCommStatus = 0; - *pFaultStatus = 0; + TRACE("(%p, %p, %p, %ld)\n", pStubMsg, pCommStatus, pFaultStatus, Status); + + switch (Status) + { + case ERROR_INVALID_HANDLE: + case RPC_S_INVALID_BINDING: + case RPC_S_UNKNOWN_IF: + case RPC_S_SERVER_UNAVAILABLE: + case RPC_S_SERVER_TOO_BUSY: + case RPC_S_CALL_FAILED_DNE: + case RPC_S_PROTOCOL_ERROR: + case RPC_S_UNSUPPORTED_TRANS_SYN: + case RPC_S_UNSUPPORTED_TYPE: + case RPC_S_PROCNUM_OUT_OF_RANGE: + case EPT_S_NOT_REGISTERED: + case RPC_S_COMM_FAILURE: + *pCommStatus = Status; + *pFaultStatus = 0; + break; + default: + *pCommStatus = 0; + *pFaultStatus = Status; + } return RPC_S_OK; } diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index c9b8fa9..04bb1d9 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1605,6 +1605,49 @@ todo_wine ok(status == RPC_S_OK, "RpcServerUnregisterIf failed (%lu)\n", status); } +static void test_NdrMapCommAndFaultStatus(void) +{ + RPC_STATUS rpc_status; + MIDL_STUB_MESSAGE StubMsg; + RPC_MESSAGE RpcMessage; + + NdrClientInitializeNew(&RpcMessage, &StubMsg, &Object_StubDesc, 5); + + for (rpc_status = 0; rpc_status < 10000; rpc_status++) + { + RPC_STATUS status; + ULONG comm_status = 0; + ULONG fault_status = 0; + ULONG expected_comm_status = 0; + ULONG expected_fault_status = 0; + status = NdrMapCommAndFaultStatus(&StubMsg, &comm_status, &fault_status, rpc_status); + ok(status == RPC_S_OK, "NdrMapCommAndFaultStatus failed with error %ld\n", status); + switch (rpc_status) + { + case ERROR_INVALID_HANDLE: + case RPC_S_INVALID_BINDING: + case RPC_S_UNKNOWN_IF: + case RPC_S_SERVER_UNAVAILABLE: + case RPC_S_SERVER_TOO_BUSY: + case RPC_S_CALL_FAILED_DNE: + case RPC_S_PROTOCOL_ERROR: + case RPC_S_UNSUPPORTED_TRANS_SYN: + case RPC_S_UNSUPPORTED_TYPE: + case RPC_S_PROCNUM_OUT_OF_RANGE: + case EPT_S_NOT_REGISTERED: + case RPC_S_COMM_FAILURE: + expected_comm_status = rpc_status; + break; + default: + expected_fault_status = rpc_status; + } + ok(comm_status == expected_comm_status, "NdrMapCommAndFaultStatus should have mapped %ld to comm status %d instead of %d\n", + rpc_status, expected_comm_status, comm_status); + ok(fault_status == expected_fault_status, "NdrMapCommAndFaultStatus should have mapped %ld to fault status %d instead of %d\n", + rpc_status, expected_fault_status, fault_status); + } +} + START_TEST( ndr_marshall ) { test_ndr_simple_type(); @@ -1618,4 +1661,5 @@ START_TEST( ndr_marshall ) test_conformant_string(); test_nonconformant_string(); test_ndr_buffer(); + test_NdrMapCommAndFaultStatus(); }

1 0

Lei Zhang : ntoskrnl.exe: Additional stub implementations.
by Alexandre Julliard 09 Jan '08

09 Jan '08

Module: wine Branch: master Commit: 122eadb815234ae5f89f3baec0fe29c1019a7ec7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=122eadb815234ae5f89f3baec… Author: Lei Zhang <thestig(a)google.com> Date: Tue Jan 8 09:45:39 2008 -0800 ntoskrnl.exe: Additional stub implementations. --- dlls/ntoskrnl.exe/ntoskrnl.c | 20 +++++++++++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 8ef06a8..dcc2769 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -485,11 +485,29 @@ void WINAPI ExFreePoolWithTag( void *ptr, ULONG tag ) /*********************************************************************** + * KeInitializeSpinLock (NTOSKRNL.EXE.@) + */ +void WINAPI KeInitializeSpinLock( PKSPIN_LOCK SpinLock ) +{ + FIXME("%p\n", SpinLock); +} + + +/*********************************************************************** + * KeInitializeTimerEx (NTOSKRNL.EXE.@) + */ +void WINAPI KeInitializeTimerEx( PKTIMER Timer, TIMER_TYPE Type ) +{ + FIXME("%p %d\n", Timer, Type); +} + + +/*********************************************************************** * KeInitializeTimer (NTOSKRNL.EXE.@) */ void WINAPI KeInitializeTimer( PKTIMER Timer ) { - FIXME("%p\n", Timer); + KeInitializeTimerEx(Timer, NotificationTimer); } diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 8749d37..7d509af 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -552,9 +552,9 @@ @ stub KeInitializeMutex @ stub KeInitializeQueue @ stub KeInitializeSemaphore -@ stub KeInitializeSpinLock +@ stdcall KeInitializeSpinLock(ptr) @ stdcall KeInitializeTimer(ptr) -@ stub KeInitializeTimerEx +@ stdcall KeInitializeTimerEx(ptr long) @ stub KeInsertByKeyDeviceQueue @ stub KeInsertDeviceQueue @ stub KeInsertHeadQueue

1 0

Rob Shearman : rpcrt4: Use send on a socket instead of write as it' s more portable.
by Alexandre Julliard 09 Jan '08

09 Jan '08

Module: wine Branch: master Commit: c370980dfadcc14e46bd3f4ec8f5f6f8168385f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c370980dfadcc14e46bd3f4ec… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 8 18:13:52 2008 +0000 rpcrt4: Use send on a socket instead of write as it's more portable. --- dlls/rpcrt4/rpc_transport.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 60087f3..4fda513 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -996,7 +996,7 @@ static int rpcrt4_conn_tcp_write(RpcConnection *Connection, int bytes_written = 0; do { - int r = write(tcpc->sock, (const char *)buffer + bytes_written, count - bytes_written); + int r = send(tcpc->sock, (const char *)buffer + bytes_written, count - bytes_written, 0); if (r >= 0) bytes_written += r; else if (errno != EAGAIN)

1 0

Alexander Nicolaysen Sørnes : Fix some errors in e-mails
by Chris Morgan 09 Jan '08

09 Jan '08

Module: appdb Branch: master Commit: d4c09ee6f3b87cc14d15ce8eacbc99f7851dd68b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d4c09ee6f3b87cc14d15ce8e… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jan 8 19:36:13 2008 +0100 Fix some errors in e-mails --- include/testData.php | 4 ++-- include/version.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/testData.php b/include/testData.php index 7fd0e31..bca9a28 100644 --- a/include/testData.php +++ b/include/testData.php @@ -438,9 +438,9 @@ class testData{ case "add": $sSubject = "Submitted testing data accepted"; $sMsg = "The testing data you submitted for '$sName' has been ". - "accepted by ".$_SESSION['current']->sRealname."."; + "accepted by ".$_SESSION['current']->sRealname.".\n"; $sMsg .= $oVersion->objectMakeUrl()."&iTestingId=".$this->iTestingId."\n"; - $sMsg .= "Administrators Responce:\n"; + $sMsg .= "Administrators response:\n"; break; case "reject": $sSubject = "Submitted testing data rejected"; diff --git a/include/version.php b/include/version.php index 6c25c68..3d0a36e 100644 --- a/include/version.php +++ b/include/version.php @@ -448,8 +448,8 @@ class version { { case "add": $sSubject = "Submitted version accepted"; - $sMsg = "The version you submitted (".$oApp->sName." ".$this->sName.") has been accepted by ".$_SESSION['current']->sRealname."."; - $sMsg .= "Administrators Responce:\n"; + $sMsg = "The version you submitted (".$oApp->sName." ".$this->sName.") has been accepted by ".$_SESSION['current']->sRealname.".\n"; + $sMsg .= "Administrators response:\n"; break; case "reject": $sSubject = "Submitted version rejected";

1 0

Dmitry Timoshkov : gdi32: Add support for scaling font metrics.
by Alexandre Julliard 08 Jan '08

08 Jan '08

Module: wine Branch: master Commit: 535053b92769ce5f020bb6c5516385cf69da5bf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=535053b92769ce5f020bb6c55… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jan 8 23:02:09 2008 +0800 gdi32: Add support for scaling font metrics. --- dlls/gdi32/freetype.c | 67 ++++++++++++++++++++++++++++++++++++++-------- dlls/gdi32/tests/font.c | 6 ---- 2 files changed, 55 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 4d51341..480b8e5 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -319,7 +319,8 @@ struct tagGdiFont { DWORD gmsize; struct list hfontlist; FONT_DESC font_desc; - LONG aveWidth; + LONG aveWidth, ppem; + float scale_x, scale_y; SHORT yMax; SHORT yMin; OUTLINETEXTMETRICW *potm; @@ -329,7 +330,6 @@ struct tagGdiFont { FONTSIGNATURE fs; GdiFont *base_font; struct list child_fonts; - LONG ppem; }; typedef struct { @@ -2439,7 +2439,6 @@ static FT_Face OpenFontFace(GdiFont *font, Face *face, LONG width, LONG height) if((err = pFT_Set_Pixel_Sizes(ft_face, 0, font->ppem)) != 0) WARN("FT_Set_Pixel_Sizes %d, %d rets %x\n", 0, font->ppem, err); } else { - font->ppem = height; if((err = pFT_Set_Pixel_Sizes(ft_face, width, height)) != 0) WARN("FT_Set_Pixel_Sizes %d, %d rets %x\n", width, height, err); } @@ -3126,6 +3125,12 @@ found: TRACE("Chosen: %s %s (%s/%p:%ld)\n", debugstr_w(family->FamilyName), debugstr_w(face->StyleName), face->file, face->font_data_ptr, face->face_index); + ret->ppem = height; + ret->aveWidth = abs(lf.lfWidth); + + ret->scale_x = 0.0; + ret->scale_y = 0.0; + if(!face->scalable) { width = face->size.x_ppem >> 6; height = face->size.y_ppem >> 6; @@ -3159,7 +3164,6 @@ found: TRACE("caching: gdiFont=%p hfont=%p\n", ret, hfont); - ret->aveWidth = FT_IS_SCALABLE(ret->ft_face) ? abs(lf.lfWidth) : 0; list_add_head(&gdi_font_list, &ret->entry); return ret; } @@ -3594,7 +3598,7 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, INT left, right, top = 0, bottom = 0, adv, lsb, bbx; FT_Angle angle = 0; FT_Int load_flags = FT_LOAD_DEFAULT | FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; - float widthRatio = 1.0; + float widthRatio = 1.0, heightRatio = 1.0; FT_Matrix transMat = identityMat; BOOL needsTransform = FALSE; @@ -3624,7 +3628,7 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, if (!font->gm[glyph_index / GM_BLOCK_SIZE]) font->gm[glyph_index / GM_BLOCK_SIZE] = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, sizeof(GM) * GM_BLOCK_SIZE); - if(font->orientation || (format != GGO_METRICS && format != GGO_BITMAP && format != WINE_GGO_GRAY16_BITMAP) || font->aveWidth || lpmat) + if(font->orientation || (format != GGO_METRICS && format != GGO_BITMAP && format != WINE_GGO_GRAY16_BITMAP) || lpmat) load_flags |= FT_LOAD_NO_BITMAP; err = pFT_Load_Glyph(ft_face, glyph_index, load_flags); @@ -3635,8 +3639,10 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, } /* Scaling factor */ - if (font->aveWidth && font->potm) { - widthRatio = (float)font->aveWidth * font->font_desc.matrix.eM11 / (float) font->potm->otmTextMetrics.tmAveCharWidth; + if (font->scale_x != 0.0) + { + widthRatio = font->scale_x; + heightRatio = font->scale_y; } left = (INT)(ft_face->glyph->metrics.horiBearingX * widthRatio) & -64; @@ -3652,7 +3658,7 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, scaleMat.xx = FT_FixedFromFloat(widthRatio); scaleMat.xy = 0; scaleMat.yx = 0; - scaleMat.yy = (1 << 16); + scaleMat.yy = FT_FixedFromFloat(heightRatio); pFT_Matrix_Multiply(&scaleMat, &transMat); needsTransform = TRUE; @@ -4130,6 +4136,39 @@ static BOOL get_bitmap_text_metrics(GdiFont *font) return TRUE; } + +static void scale_font_metrics(GdiFont *font, LPTEXTMETRICW ptm) +{ + if (font->scale_x == 0.0) + { + if (FT_IS_SCALABLE(font->ft_face) || !font->ppem) + font->scale_y = 1.0; + else + { + font->scale_y = (float)font->ppem * font->font_desc.matrix.eM22; + font->scale_y /= (float)font->potm->otmTextMetrics.tmHeight; + } + + if (font->aveWidth) + { + font->scale_x = (float)font->aveWidth * font->font_desc.matrix.eM11; + font->scale_x /= (float)font->potm->otmTextMetrics.tmAveCharWidth; + } + else + font->scale_x = font->scale_y; + + TRACE("font scale x: %f y: %f\n", font->scale_x, font->scale_y); + } + ptm->tmHeight = (float)ptm->tmHeight * font->scale_y; + ptm->tmAscent = (float)ptm->tmAscent * font->scale_y; + ptm->tmDescent = (float)ptm->tmDescent * font->scale_y; + ptm->tmInternalLeading = (float)ptm->tmInternalLeading * font->scale_y; + ptm->tmExternalLeading = (float)ptm->tmExternalLeading * font->scale_y; + + ptm->tmAveCharWidth = (float)ptm->tmAveCharWidth * font->scale_x; + ptm->tmMaxCharWidth = (float)ptm->tmMaxCharWidth * font->scale_x; +} + /************************************************************* * WineEngGetTextMetrics * @@ -4143,10 +4182,8 @@ BOOL WineEngGetTextMetrics(GdiFont *font, LPTEXTMETRICW ptm) } if(!font->potm) return FALSE; memcpy(ptm, &font->potm->otmTextMetrics, sizeof(*ptm)); + scale_font_metrics(font, ptm); - if (font->aveWidth) { - ptm->tmAveCharWidth = font->aveWidth * font->font_desc.matrix.eM11; - } return TRUE; } @@ -4176,7 +4213,10 @@ UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize, if(font->potm) { if(cbSize >= font->potm->otmSize) + { memcpy(potm, font->potm, font->potm->otmSize); + scale_font_metrics(font, &potm->otmTextMetrics); + } return font->potm->otmSize; } @@ -4404,7 +4444,10 @@ UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize, ret = needed; if(potm && needed <= cbSize) + { memcpy(potm, font->potm, font->potm->otmSize); + scale_font_metrics(font, &potm->otmTextMetrics); + } end: HeapFree(GetProcessHeap(), 0, style_nameW); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index b6e8327..7d73c19 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -244,20 +244,14 @@ static void test_bitmap_font(void) bitmap_lf.lfHeight = height_orig * 2; bitmap_lf.lfWidth *= 3; hfont = create_font("3x2", &bitmap_lf); -todo_wine -{ test_font_metrics(hdc, hfont, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 3, 2); -} DeleteObject(hfont); /* test integer scaling 3x3 */ bitmap_lf.lfHeight = height_orig * 3; bitmap_lf.lfWidth = 0; hfont = create_font("3x3", &bitmap_lf); -todo_wine -{ test_font_metrics(hdc, hfont, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 3, 3); -} DeleteObject(hfont); ReleaseDC(0, hdc);

1 0

Stefan Dösinger : wined3d: Detect geforce 7300 cards.
by Alexandre Julliard 08 Jan '08

08 Jan '08

Module: wine Branch: master Commit: c290f4c7a3f357288d4766770f5239ea5b682ceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c290f4c7a3f357288d4766770… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 1 15:29:58 2008 +0100 wined3d: Detect geforce 7300 cards. --- dlls/wined3d/directx.c | 5 +++++ include/wine/wined3d_gl.h | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9536b71..1386a76 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1022,6 +1022,11 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { gl_info->gl_card = CARD_NVIDIA_GEFORCE_7400; vidmem = 256; /* The 7400 uses 256-512MB */ } + /* Geforce7 lowend */ + else if(strstr(gl_info->gl_renderer, "7300")) { + gl_info->gl_card = CARD_NVIDIA_GEFORCE_7300; + vidmem = 256; /* Mac Pros with this card have 256 MB */ + } /* Geforce6 highend */ else if(strstr(gl_info->gl_renderer, "6800")) { diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 84d8076..f51a4e6 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -3114,6 +3114,7 @@ typedef enum _GL_Cards { CARD_NVIDIA_GEFORCE_6600GT = 0x0140, CARD_NVIDIA_GEFORCE_6800 = 0x0041, CARD_NVIDIA_GEFORCE_7400 = 0x01d8, + CARD_NVIDIA_GEFORCE_7300 = 0x01d7, /* GeForce Go 7300 */ CARD_NVIDIA_GEFORCE_7600 = 0x0391, CARD_NVIDIA_GEFORCE_7800GT = 0x0092, CARD_NVIDIA_GEFORCE_8300GS = 0x0423,

1 0

Stefan Dösinger : wined3d: Fix a pixelshader recompilation check.
by Alexandre Julliard 08 Jan '08

08 Jan '08

Module: wine Branch: master Commit: 29a0b3622c488e4ddbd6d7442fd6a6e41ac97b9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=29a0b3622c488e4ddbd6d7442… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 1 16:59:53 2008 +0100 wined3d: Fix a pixelshader recompilation check. --- dlls/wined3d/pixelshader.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 7981501..cabc629 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -604,10 +604,11 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_CompileShader(IWineD3DPixelShader } } if(This->baseShader.hex_version >= WINED3DPS_VERSION(3,0)) { - if(((IWineD3DDeviceImpl *) This->baseShader.device)->strided_streams.u.s.position_transformed && - This->vertexprocessing != pretransformed) { - WARN("Recompiling shader because pretransformed vertices are provided, which wasn't the case before\n"); - goto recompile; + if(((IWineD3DDeviceImpl *) This->baseShader.device)->strided_streams.u.s.position_transformed) { + if(This->vertexprocessing != pretransformed) { + WARN("Recompiling shader because pretransformed vertices are provided, which wasn't the case before\n"); + goto recompile; + } } else if(!use_vs((IWineD3DDeviceImpl *) This->baseShader.device) && This->vertexprocessing != fixedfunction) { WARN("Recompiling shader because fixed function vp is in use, which wasn't the case before\n");

1 0

Rob Shearman : rpcrt4: Set the fBufferValid flag in NdrProxyGetBuffer.
by Alexandre Julliard 08 Jan '08

08 Jan '08

Module: wine Branch: master Commit: 9ff15252d09066f8e9144016391b8de8a4343008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ff15252d09066f8e91440163… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 8 12:02:55 2008 +0000 rpcrt4: Set the fBufferValid flag in NdrProxyGetBuffer. Only call IRpcChannelBuffer_FreeBuffer in NdrProxyFreeBuffer if fBufferValid is set. --- dlls/rpcrt4/cproxy.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 6580bcf..084285a 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -364,6 +364,7 @@ void WINAPI NdrProxyGetBuffer(void *This, RpcRaiseException(hr); return; } + pStubMsg->fBufferValid = TRUE; pStubMsg->BufferStart = pStubMsg->RpcMsg->Buffer; pStubMsg->BufferEnd = pStubMsg->BufferStart + pStubMsg->BufferLength; pStubMsg->Buffer = pStubMsg->BufferStart; @@ -408,11 +409,14 @@ void WINAPI NdrProxySendReceive(void *This, void WINAPI NdrProxyFreeBuffer(void *This, PMIDL_STUB_MESSAGE pStubMsg) { - HRESULT hr; - TRACE("(%p,%p)\n", This, pStubMsg); - hr = IRpcChannelBuffer_FreeBuffer(pStubMsg->pRpcChannelBuffer, - (RPCOLEMESSAGE*)pStubMsg->RpcMsg); + + if (pStubMsg->fBufferValid) + { + IRpcChannelBuffer_FreeBuffer(pStubMsg->pRpcChannelBuffer, + (RPCOLEMESSAGE*)pStubMsg->RpcMsg); + pStubMsg->fBufferValid = TRUE; + } } /***********************************************************************

1 0